[Libreoffice-commits] core.git: sc/inc sc/source

[Andras Timar]

 sc/inc/globstr.hrc                           |    2 ++
 sc/source/ui/condformat/condformathelper.cxx |    9 +++++++--
 sc/source/ui/src/globstr.src                 |    4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 3b353215eaa7223b821026dbfc91e710ca9e484d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Aug 21 19:19:50 2016 +0200

    Make the string 'and' translatable in Manage Conditional Formatting dialog
    
    Change-Id: Ieb6422c399866c02e6f1e6170a2753495a7be5fd
    Reviewed-on: https://gerrit.libreoffice.org/28279
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 4d8c80c..9c94a7c 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -141,6 +141,8 @@
 
 #define STR_DATABASE_NOTFOUND       95
 
+#define STR_COND_AND                96
+
 #define STR_UNDO_PRINTRANGES        97
 
 #define STR_UNDO_DEC_INDENT         98
diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx
index b9377fa..12b4e00 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -134,7 +134,9 @@ OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, c
                         if(eMode == SC_COND_BETWEEN || eMode == SC_COND_NOTBETWEEN)
                         {
                             aBuffer.append(pEntry->GetExpression(rPos, 0));
-                            aBuffer.append(" and ");
+                            aBuffer.append(" ");
+                            aBuffer.append(ScGlobal::GetRscString(STR_COND_AND));
+                            aBuffer.append(" ");
                             aBuffer.append(pEntry->GetExpression(rPos, 1));
                         }
                         else if(eMode <= SC_COND_NOTEQUAL || eMode >= SC_COND_BEGINS_WITH)
@@ -184,7 +186,10 @@ OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int
             aBuffer.append(" ").append(aStr1);
             if(nIndex == 6 || nIndex == 7)
             {
-                aBuffer.append(" and ").append(aStr2);
+                aBuffer.append(" ");
+                aBuffer.append(ScGlobal::GetRscString(STR_COND_AND));
+                aBuffer.append(" ");
+                aBuffer.append(aStr2);
             }
         }
     }
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 90576bf..27ef036 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1964,6 +1964,10 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "next year";
     };
+    String STR_COND_AND
+    {
+        Text [ en-US ] = "and";
+    };
     String STR_ERR_CONDFORMAT_PROTECTED
     {
         Text [ en-US ] = "Conditional Formats can not be created, deleted or changed in protected sheets!";