[Libreoffice-commits] core.git: 3 commits - android/sdremote l10ntools/source
Thorsten Behrens
tbehrens at suse.com
Mon Feb 11 06:08:19 PST 2013
android/sdremote/.gitignore | 1 +
android/sdremote/Makefile | 2 +-
android/sdremote/res/.gitignore | 2 ++
l10ntools/source/lngmerge.cxx | 4 ++--
l10ntools/source/stringmerge.cxx | 1 +
5 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 049cf7c753339f761cd49b83744abab6aa820ea4
Author: Thorsten Behrens <tbehrens at suse.com>
Date: Mon Feb 11 15:05:43 2013 +0100
More quote escaping on translated strings.
Also escape single quotes for ulf, escape both double and single
quotes for stringex.
Change-Id: I4c9b8ea88c0172e0d2fdbc79c68bce34668a64f7
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 71f68ef..812c436 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -269,7 +269,7 @@ sal_Bool LngParser::Merge(
rtl::OString sText1( sLang );
sText1 += " = \"";
// escape quotes, unescape double escaped quotes fdo#56648
- sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"");
+ sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"").replaceAll("\'","\\\'").replaceAll("\\\\\'","\\\'");
sText1 += "\"";
*pLine = sText1;
Text[ sLang ] = sNewText;
@@ -307,7 +307,7 @@ sal_Bool LngParser::Merge(
sLine += sCur;
sLine += " = \"";
// escape quotes, unescape double escaped quotes fdo#56648
- sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"");
+ sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"").replaceAll("\'","\\\'").replaceAll("\\\\\'","\\\'");
sLine += "\"";
nLastLangPos++;
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 71909d9..26aabcb 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -161,6 +161,7 @@ void StringParser::Merge(
{
OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, m_sLang );
+ sNewText = sNewText.replaceAll("\"",""").replaceAll("\\\\\"","\\\"").replaceAll("\'","'").replaceAll("\\\\\'","\\\'");
xmlNodeSetContent(
pCurrent,
xmlEncodeSpecialChars( NULL,
commit 63fdfd1eb63c1c1e17d3a62ea23b39bbeabfeae0
Author: Thorsten Behrens <tbehrens at suse.com>
Date: Mon Feb 11 15:04:51 2013 +0100
Filter out three-letter locales - aapt breaks there.
See
http://stackoverflow.com/questions/10330893/android-resources-for-languages-with-only-3-letter-codes
for some more background.
Change-Id: Ib8c62d008239de3f0ba35ebe17f8f6974f28beb1
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 1049e8d..3972a06 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -44,7 +44,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
endef
define android_get_langlist
-$(foreach lang,$(filter-out en-US,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo qtz nso kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
endef
$(eval $(call android_translations_rules,$(call android_get_langlist)))
commit 5b614cb2ac2643223c5be4e0d4df5515083b3781
Author: Thorsten Behrens <tbehrens at suse.com>
Date: Mon Feb 11 15:03:51 2013 +0100
Ignore more in-tree build output on android.
Change-Id: Icb6fb1ffab19f02d0af807d8f92201f1914ac08c
diff --git a/android/sdremote/.gitignore b/android/sdremote/.gitignore
new file mode 100644
index 0000000..b04e09d
--- /dev/null
+++ b/android/sdremote/.gitignore
@@ -0,0 +1 @@
+/translations*
diff --git a/android/sdremote/res/.gitignore b/android/sdremote/res/.gitignore
new file mode 100644
index 0000000..95f7438
--- /dev/null
+++ b/android/sdremote/res/.gitignore
@@ -0,0 +1,2 @@
+/values-*
+!/values-v10
More information about the Libreoffice-commits
mailing list