android/source/res/values/strings.xml | 2 +-
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 4
++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8ff75a0bd02555c528f50eb7c045927b41dc3c36
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu Jan 18 14:34:20 2018 +0100
use string-resource with placeholder instead of hardcoded concatenation
as this is more l10n/translation friendly
Change-Id: I1050fb24e0d6e94a2f1ad1605003a9c7010ca7cb
diff --git a/android/source/res/values/strings.xml
b/android/source/res/values/strings.xml
index f0331179f915..db06d3e2a7cc 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -122,7 +122,7 @@
<string name="search_label">Go</string>
<string name="directory_browser_label">Choose Directory</string>
<string name="bad_directory">Invalid directory path</string>
- <string name="current_dir">Current Directory:</string>
+ <string name="current_dir">Current Directory: %1$s</string>
<!-- Save Alert dialog strings -->
<string name="save_alert_dialog_title">Save the document before
closing?</string>
diff --git
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 8d4891f2053a..5b9dd0cc2ee0 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -473,8 +473,8 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
findViewById(R.id.header_recents).setVisibility((View.GONE));
actionBar.setTitle(dir.getName());
findViewById(R.id.text_directory_path).setVisibility(View.VISIBLE);
-
((TextView)findViewById(R.id.text_directory_path)).setText(getString(R.string.current_dir)
+
- " " + dir.getUri().getPath());
+
((TextView)findViewById(R.id.text_directory_path)).setText(getString(R.string.current_dir,
+ dir.getUri().getPath()));
}
new AsyncTask<IFile, Void, Void>() {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
