From d54a4b07e59f879daf363ba9d42cfe5874d3b2f0 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Tue, 29 Mar 2016 11:32:51 +0300
Subject: [PATCH 1/3] Move version upgrade arrow string to resources

Hardcoded strings cannot be localized.
---
 .../main/java/org/fdroid/fdroid/views/AppListAdapter.java   | 6 ++++--
 app/src/main/res/values/donottranslate.xml                  | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java
index 307088427..61f7846fb 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java
@@ -20,6 +20,7 @@ public abstract class AppListAdapter extends CursorAdapter {
 
     private LayoutInflater mInflater;
     private DisplayImageOptions displayImageOptions;
+    private String upgradeFromTo;
 
     public AppListAdapter(Context context, Cursor c) {
         super(context, c);
@@ -45,7 +46,7 @@ public abstract class AppListAdapter extends CursorAdapter {
         mInflater = (LayoutInflater) context.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         displayImageOptions = Utils.getImageLoadingOptions().build();
-
+        upgradeFromTo = context.getResources().getString(R.string.upgrade_from_to);
     }
 
     protected abstract boolean showStatusUpdate();
@@ -122,7 +123,8 @@ public abstract class AppListAdapter extends CursorAdapter {
         final String installedVersionString = app.installedVersionName;
 
         if (app.canAndWantToUpdate() && showStatusUpdate()) {
-            return installedVersionString + " → " + app.getSuggestedVersion();
+            return String.format(upgradeFromTo,
+                    installedVersionString, app.getSuggestedVersion());
         }
 
         if (app.installedVersionCode > 0 && showStatusInstalled()) {
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 865ce73ab..26a43b90a 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -9,6 +9,7 @@
     <string name="license_gplv3_later">GNU General Public License version\u00A03 or later</string>
 
     <string name="https">https://</string>
+    <string name="upgrade_from_to">%1$s → %2$s</string>
 
     <string-array name="updateIntervalValues">
         <item>0</item>

From 771ac45b8a1dc9a3bfbdca067965554a2e8adc5d Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Tue, 29 Mar 2016 11:34:08 +0300
Subject: [PATCH 2/3] Add version upgrade string for RTL languages

---
 F-Droid/res/values-ldrtl/donottranslate.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 F-Droid/res/values-ldrtl/donottranslate.xml

diff --git a/F-Droid/res/values-ldrtl/donottranslate.xml b/F-Droid/res/values-ldrtl/donottranslate.xml
new file mode 100644
index 000000000..cfde9ea15
--- /dev/null
+++ b/F-Droid/res/values-ldrtl/donottranslate.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="upgrade_from_to">%1$s ← %2$s</string>
+
+</resources>

From 057f6c167c111caa9a00f34c519504ecd41ad164 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Tue, 29 Mar 2016 13:58:01 +0300
Subject: [PATCH 3/3] Skip values-ldrtl while listing languages

ldrtl is a modifier ("layout direction right-to-left"), not a language.
---
 app/tools/langs-list-check.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/tools/langs-list-check.py b/app/tools/langs-list-check.py
index 4b1953a6f..d2495cbaf 100755
--- a/app/tools/langs-list-check.py
+++ b/app/tools/langs-list-check.py
@@ -28,6 +28,8 @@ for d in glob.glob(os.path.join('src', 'main', 'res', 'values-*')):
         continue
     if re.match('^v[0-9]+$', lang):
         continue
+    if lang == 'ldrtl':
+        continue
     if os.path.islink(d):
         continue
     trans.add(lang)