[Libreoffice-commits] .: 2 commits - l10ntools/inc l10ntools/scripts l10ntools/source scp2/source

[Andras Timar]

 l10ntools/inc/export.hxx            |    1 +
 l10ntools/scripts/po2lo             |    2 +-
 l10ntools/source/cfgmerge.cxx       |    4 +++-
 l10ntools/source/export.cxx         |    4 ++--
 scp2/source/ooo/module_langpack.ulf |    2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3f00358bfdad0a18fe053c3d154f74e3aa6afba9
Author: Andras Timar <atimar at suse.com>
Date:   Sat Apr 14 14:22:13 2012 +0200

    export x-comments to sdf file into the 'helptext' field
    
    helptext field has not been in use for a while, so we can
    use that to hold the x-comment

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 760a745..bf1809b 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -72,6 +72,7 @@ typedef boost::unordered_map<rtl::OString, MergeData*, rtl::OStringHash>
     MergeDataHashMap;
 
 #define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
+#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
 #define LIST_REFID  "LIST_REFID"
 
 typedef OStringHashMap ExportListEntry;
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index 4bcfb8b..cdf8892 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -51,7 +51,7 @@ class Entry:
             prefix += "%s." % self.items[3]
         self.keys = []
         # 10..13 are translation types
-        for idx in range(10, 14):
+        for idx in [10,12,13]:
             try:
                 if len(self.items[idx]):
                     t = {10:'text', 12:'quickhelptext', 13:'title'}[idx]
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 2c39fc6..b8f6c19 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -483,6 +483,7 @@ void CfgExport::WorkOnRessourceEnd()
     if ( pStackData->sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))].getLength() )
         {
             rtl::OString sFallback = pStackData->sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))];
+            rtl::OString sXComment = pStackData->sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))];
             rtl::OString sLocalId = pStackData->sIdentifier;
             rtl::OString sGroupId;
             if ( aStack.size() == 1 ) {
@@ -512,7 +513,8 @@ void CfgExport::WorkOnRessourceEnd()
                 sOutput += sCur;
                 sOutput += "\t";
 
-                sOutput += sText; sOutput += "\t\t\t\t";
+                sOutput += sText; sOutput += "\t";
+                sOutput += sXComment; sOutput += "\t\t\t";
 
                 pOutputStream << sOutput.getStr() << '\n';
             }
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 60c4a73..329fd19 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1006,8 +1006,8 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
                         sXText = pResData->sText[ SOURCE_LANGUAGE ];
                     }
 
-                    if (!pResData->sHelpText[ sCur ].isEmpty())
-                        sXHText = pResData->sHelpText[ sCur ];
+                    if (!pResData->sText[ X_COMMENT ].isEmpty())
+                        sXHText = pResData->sText[ X_COMMENT ];
                     else {
                         sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
                     }
commit af0e727b5dfcdea0555748e7e6415d70fe7665a9
Author: Andras Timar <atimar at suse.com>
Date:   Sat Apr 14 14:19:56 2012 +0200

    fix a typo (BN instead of BN_IN)

diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index fa598e9..d321988 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -268,7 +268,7 @@ en-US = "Installs the Bengali (Bangladesh) user interface"
 [STR_NAME_MODULE_LANGPACK_BN_IN]
 en-US = "Bengali (India)"
 
-[STR_DESC_MODULE_LANGPACK_BN]
+[STR_DESC_MODULE_LANGPACK_BN_IN]
 en-US = "Installs the Bengali (India) user interface"
 
 [STR_NAME_MODULE_LANGPACK_OR]