Ticket #7727: boost-gettext_info.patch

boost/locale/gnu_gettext.hpp

@@ -231 +231 @@
     template<typename CharType>
     message_format<CharType> *create_messages_facet(catalog_info const &info);
 
+    ///
+    /// Gets catalog information from a locale.
+    ///
+    template<typename CharType>
+    catalog_info get_catalog_info(std::locale const& loc);
+
+    /// \cond INTERNAL
+
+    template<>
+    BOOST_LOCALE_DECL catalog_info get_catalog_info<char>(std::locale const& loc);
+    
+    template<>
+    BOOST_LOCALE_DECL catalog_info get_catalog_info<wchar_t>(std::locale const& loc);
+
+    #ifdef BOOST_HAS_CHAR16_T
+    template<>
+    BOOST_LOCALE_DECL catalog_info get_catalog_info<char16_t>(std::locale const& loc);
+    #endif
+    
+    #ifdef BOOST_HAS_CHAR32_T
+    template<>
+    BOOST_LOCALE_DECL catalog_info get_catalog_info<char32_t>(std::locale const& loc);
+    #endif
+
+    /// \endcond
 
     // ---- deprecated stuff goes there --- //
 

libs/locale/src/shared/message.cpp

@@ -567 +567 @@
                     mo_catalogs_.resize(domains.size());
                     plural_forms_.resize(domains.size());
 
+                    _info.language(language);
+                    _info.country(country);
+                    _info.variant(variant);
+                    _info.encoding(encoding);
+                    _info.locale_category(lc_cat);
+
 
                     for(unsigned id=0;id<domains.size();id++) {
                         std::string domain=domains[id].name();
@@ -580 +586 @@
                                 for(unsigned k=0;!found && k<formats.size();k++) {
                                     std::string full_path = (format(formats[k]) % search_paths[i] % paths[j] % lc_cat % domain).str(std::locale::classic());
                                     found = load_file(full_path,encoding,key_encoding,id,inf.callback());
+
+                                    if(found)
+                                    {
+                                        _info.add_domain(domain);
+                                        _info.add_path(search_paths[i]);
+                                        _info.add_path_format(formats[k]);
+                                    }
                                 }
                             }
                         }
@@ -591 +604 @@
                     return runtime_conversion<char_type>(msg,buffer,key_conversion_required_,locale_encoding_,key_encoding_);
                 }
 
+                catalog_info get_info(void) const
+                {
+                    return _info;
+                }
+
                 virtual ~mo_message()
                 {
                 }
@@ -746 +764 @@
                 std::string locale_encoding_;
                 std::string key_encoding_; 
                 bool key_conversion_required_;
+                catalog_info _info;
             };
 
 
@@ -884 +903 @@
             }
 
 
+            template <typename CharType>
+            catalog_info _get_catalog_info(std::locale const& loc)
+            {
+                typedef mo_message<CharType> facet_type;
+                if(std::has_facet<facet_type>(loc))
+                    return std::use_facet<facet_type>(loc).get_info();
+                else
+                    return catalog_info();
+            }
+
+            template <>
+            catalog_info get_catalog_info<char>(std::locale const& loc)
+            { return _get_catalog_info<char>(loc); }
+
+            template <>
+            catalog_info get_catalog_info<wchar_t>(std::locale const& loc)
+            { return _get_catalog_info<wchar_t>(loc); }
+
+            #ifdef BOOST_HAS_CHAR16_T
+            template <>
+            catalog_info get_catalog_info<char16_t>(std::locale const& loc)
+            { return _get_catalog_info<char16_t>(loc); }
+            #endif
+
+            #ifdef BOOST_HAS_CHAR32_T
+            template <>
+            catalog_info get_catalog_info<char32_t>(std::locale const& loc)
+            { return _get_catalog_info<char32_t>(loc); }
+            #endif
+
+
             std::string catalog_info::language() const { return d->language; }
             void catalog_info::language(std::string const &v) { d->language=v; }