[MediaWiki-commits] [Gerrit] Fix conversion parameter in an older translation - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review) 
BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180550

Change subject: Fix conversion parameter in an older translation
..

Fix conversion parameter in an older translation

This would have caused a crash.
Also added more (commented out) logging for TranslationTests.

Change-Id: I8975962486841d236ebab77264a6ac98e90a360c
(cherry picked from commit 8d72e2c8f1d0a4d5bfda0049fb5a380d3bbba39c)
---
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
M wikipedia/res/values-ka/strings.xml
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/50/180550/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index dc9a5dc..a63c750 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -170,8 +170,9 @@
 }
 
 public void checkTranslationHasParameter(Res res, String paramName, Object 
val1, String alternateFormat) {
+//Log.i(TAG, myLocale + : + res.name);
 String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, val1);
-//Log.i(TAG, myLocale + : + translatedString);
+//Log.d(TAG, translatedString);
 if (!translatedString.contains(String.format(paramName, val1))
  (alternateFormat == null || 
!translatedString.contains(alternateFormat))) {
 final String msg = myLocale + : + res.name +  =  + 
translatedString + ' doesn't contain  + val1;
diff --git a/wikipedia/res/values-ka/strings.xml 
b/wikipedia/res/values-ka/strings.xml
index 7128752..f3b4eda 100644
--- a/wikipedia/res/values-ka/strings.xml
+++ b/wikipedia/res/values-ka/strings.xml
@@ -221,5 +221,5 @@
   string name=gallery_menu_more_infoმეტი ინფორმაცია/string
   string name=menu_gallery_visit_pageგადადით ფაილის გვერდზე/string
   string name=gallery_error_draw_failedსურათის ჩასმა შეუძლებელია./string
-  string name=gallery_license_text fuzzy=trueლიცენზია: %/string
+  string name=gallery_license_text fuzzy=trueლიცენზია: %s/string
 /resources

-- 
To view, visit https://gerrit.wikimedia.org/r/180550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8975962486841d236ebab77264a6ac98e90a360c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix conversion parameter in an older translation - change (apps...wikipedia)

2014-12-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix conversion parameter in an older translation
..


Fix conversion parameter in an older translation

This would have caused a crash.
Also added more (commented out) logging for TranslationTests.

Change-Id: I8975962486841d236ebab77264a6ac98e90a360c
(cherry picked from commit 8d72e2c8f1d0a4d5bfda0049fb5a380d3bbba39c)
---
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
M wikipedia/res/values-ka/strings.xml
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index dc9a5dc..a63c750 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -170,8 +170,9 @@
 }
 
 public void checkTranslationHasParameter(Res res, String paramName, Object 
val1, String alternateFormat) {
+//Log.i(TAG, myLocale + : + res.name);
 String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, val1);
-//Log.i(TAG, myLocale + : + translatedString);
+//Log.d(TAG, translatedString);
 if (!translatedString.contains(String.format(paramName, val1))
  (alternateFormat == null || 
!translatedString.contains(alternateFormat))) {
 final String msg = myLocale + : + res.name +  =  + 
translatedString + ' doesn't contain  + val1;
diff --git a/wikipedia/res/values-ka/strings.xml 
b/wikipedia/res/values-ka/strings.xml
index 7128752..f3b4eda 100644
--- a/wikipedia/res/values-ka/strings.xml
+++ b/wikipedia/res/values-ka/strings.xml
@@ -221,5 +221,5 @@
   string name=gallery_menu_more_infoმეტი ინფორმაცია/string
   string name=menu_gallery_visit_pageგადადით ფაილის გვერდზე/string
   string name=gallery_error_draw_failedსურათის ჩასმა შეუძლებელია./string
-  string name=gallery_license_text fuzzy=trueლიცენზია: %/string
+  string name=gallery_license_text fuzzy=trueლიცენზია: %s/string
 /resources

-- 
To view, visit https://gerrit.wikimedia.org/r/180550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8975962486841d236ebab77264a6ac98e90a360c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits