Ticket #7727: gettext_info.patch

boost/locale.hpp

@@ -18 +18 @@
 #include <boost/locale/formatting.hpp>
 #include <boost/locale/generator.hpp>
 #include <boost/locale/gnu_gettext.hpp>
+#include <boost/locale/gnu_gettext_info.hpp>
 #include <boost/locale/info.hpp>
 #include <boost/locale/localization_backend.hpp>
 #include <boost/locale/message.hpp>

new file oost/locale/gnu_gettext_info.hpp

@@ +1 @@
+//
+//  Copyright (c) 2009-2011 Artyom Beilis (Tonkikh)
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef BOOST_LOCALE_GNU_GETTEXT_INFO_HPP_INCLUDED
+#define BOOST_LOCALE_GNU_GETTEXT_INFO_HPP_INCLUDED
+#include <boost/locale/config.hpp>
+#include <locale>
+#include <string>
+
+
+namespace boost {
+namespace locale {
+namespace gnu_gettext {
+    ///
+    /// \brief This class holds functions that provide access to GNU Gettext settings
+    ///
+    class info {
+        public:
+            virtual ~info()
+            {
+            }
+            
+            ///
+            /// Gets the language the catalog is loaded for
+            ///
+            virtual std::string language() = 0;
+
+            ///
+            /// Get the domain the catalog is loaded for
+            ///
+            virtual std::string domain() = 0;
+
+            ///
+            /// Get the the search path the catalog was found in
+            ///
+            virtual std::string search_path() = 0;
+
+            ///
+            /// Get the path format the catalog used
+            ///
+            virtual std::string path_format() = 0;
+
+            ///
+            /// Get the path format to the catalog used
+            ///
+            virtual std::string full_path() = 0;
+    };
+
+    template <typename char_type>
+    info* get_info(std::locale const& loc);
+
+    template <>
+    BOOST_LOCALE_DECL info* get_info<char>(std::locale const& loc);
+
+    #ifdef BOOST_HAS_CHAR16_T
+
+    template <>
+    BOOST_LOCALE_DECL info* get_info<char16_t>(std::locale const& loc);
+
+    #endif
+
+    #ifdef BOOST_HAS_CHAR32_T
+
+    template <>
+    BOOST_LOCALE_DECL info* get_info<char32_t>(std::locale const& loc);
+
+    #endif
+}
+}
+}
+
+#endif
+
+// vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

libs/locale/src/shared/message.cpp

@@ -9 +9 @@
 #include <boost/config.hpp>
 #include <boost/locale/message.hpp>
 #include <boost/locale/gnu_gettext.hpp>
+#include <boost/locale/gnu_gettext_info.hpp>
 #include <boost/locale/format.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/locale/encoding.hpp>
@@ -481 +482 @@
                 return buffer.c_str();
             }
 
+            struct catalog_settings
+            {
+                std::string domain;
+                std::string path;
+                std::string search_path;
+                std::string format;
+                std::string full_path;
+            };
+
             template<typename CharType>
             class mo_message : public message_format<CharType> {
 
@@ -581 +591 @@
                                 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)
+                                    {
+                                        settings_.domain = domain;
+                                        settings_.path = paths[j];
+                                        settings_.search_path = search_paths[i];
+                                        settings_.format = formats[i];
+                                        settings_.full_path = full_path;
+                                    }
                                 }
                             }
                         }
@@ -596 +615 @@
                 {
                 }
 
+                catalog_settings get_catalog_settings() const
+                {
+                    return settings_;
+                }
+
             private:
                 int compare_encodings(std::string const &left,std::string const &right)
                 {
@@ -747 +771 @@
                 std::string locale_encoding_;
                 std::string key_encoding_; 
                 bool key_conversion_required_;
+
+                catalog_settings settings_;
             };
 
             template<>
@@ -778 +804 @@
                 return new mo_message<char32_t>(data);
             }
             #endif
+
+            template <typename char_type>
+            class mo_info : public info {
+                typedef mo_message<char_type> message_type;
+                
+                public:
+                    mo_info(message_type const* Msg)
+                        : msg(Msg)
+                    {
+                        settings = msg->get_catalog_settings();
+                    }
+
+                    virtual std::string language()
+                    {
+                        return settings.path;
+                    }
+
+                    virtual std::string domain()
+                    {
+                        return settings.domain;
+                    }
+
+                    virtual std::string search_path()
+                    {
+                        return settings.search_path;
+                    }
+
+                    virtual std::string path_format()
+                    {
+                        return settings.format;
+                    }
+
+                    virtual std::string full_path()
+                    {
+                        return settings.full_path;
+                    }
+
+                private:
+                    message_type const* msg;
+                    catalog_settings settings;
+            };
+
+            template <typename char_type>
+            info* _get_info(std::locale const& loc)
+            {
+                typedef mo_message<char_type> facet_type;
+                
+                if(!std::has_facet<facet_type>(loc))
+                {
+                    return 0;
+                }
+                
+                facet_type const* facet = &(std::use_facet<facet_type>(loc));
+                
+                return new mo_info<char_type>(facet);
+            }
+            
+            template <>
+            info* get_info<char>(std::locale const& loc)
+            {
+                return _get_info<char>(loc);
+            }
+            
+            template <>
+            info* get_info<wchar_t>(std::locale const& loc)
+            {
+                return _get_info<wchar_t>(loc);
+            }
+            
+            #ifdef BOOST_HAS_CHAR16_T
+            
+            template <>
+            info* get_info<char16_t>(std::locale const& loc)
+            {
+                return _get_info<char16_t>(loc);
+            }
+            
+            #endif
+            
+            #ifdef BOOST_HAS_CHAR32_T
+            
+            template <>
+            info* get_info<char32_t>(std::locale const& loc)
+            {
+                return _get_info<char32_t>(loc);
+            }
+            
+            #endif
+
         } /// gnu_gettext
 
     } // locale

libs/locale/test/test_message.cpp

@@ -10 +10 @@
 #include <boost/locale/localization_backend.hpp>
 #include <boost/locale/message.hpp>
 #include <boost/locale/gnu_gettext.hpp>
+#include <boost/locale/gnu_gettext_info.hpp>
 #include <boost/locale/encoding.hpp>
 #include "test_locale.hpp"
 #include "test_locale_tools.hpp"
@@ -523 +524 @@
             bl::dnpgettext("",L"",L"",L"",1);
         }
         
+        std::cout << "Testing Gettext Info" << std::endl;
+        {
+            std::string format = "{1}/{2}/{3}/{4}.mo";
+            std::string search_path;
+            if(argc==2)
+                search_path = argv[1];
+            else
+                search_path = "./";
+            
+            boost::locale::generator g;
+            g.add_messages_domain("full");
+            g.add_messages_path(search_path);
+            
+            std::locale l = g("he_IL.UTF-8");
+            
+            bl::gnu_gettext::info* info = bl::gnu_gettext::get_info<char>(l);
+            
+            TEST(info->language() == "he_IL");
+            TEST(info->domain() == "full");
+            TEST(info->path_format() == format);
+            TEST(info->full_path() == search_path + "/he_IL/LC_MESSAGES/full.mo");
+            
+            delete info;
+        }
     }
     catch(std::exception const &e) {
         std::cerr << "Failed " << e.what() << std::endl;