diff options
Diffstat (limited to 'org.fox.ttrss/src/main')
4 files changed, 10 insertions, 8 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index eb9f8e7a..21ce8e31 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="298" + android:versionCode="299" android:versionName="1.87" > <uses-sdk diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java index a9859d42..6b99b29b 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -41,7 +41,7 @@ public class PreferencesActivity extends PreferenceActivity { ZipEntry ze = zf.getEntry("classes.dex"); long time = ze.getTime(); - buildTimestamp = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss", + buildTimestamp = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss", Locale.getDefault()).format(time); } catch (PackageManager.NameNotFoundException e) { @@ -50,8 +50,8 @@ public class PreferencesActivity extends PreferenceActivity { e.printStackTrace(); } - findPreference("version").setTitle(getString(R.string.prefs_version, version, versionCode)); - findPreference("build_timestamp").setTitle(getString(R.string.prefs_build_timestamp, buildTimestamp)); + findPreference("version").setSummary(getString(R.string.prefs_version, version, versionCode)); + findPreference("build_timestamp").setSummary(getString(R.string.prefs_build_timestamp, buildTimestamp)); } } diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 5ebedeb3..76bd9a1b 100644 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -263,7 +263,9 @@ <string name="headline_display_mode_default">Default</string> <string name="headline_display_mode_no_images">No images</string> <string name="headline_display_mode_compact">Compact</string> - <string name="prefs_version">Version: %1$s (%2$d)</string> - <string name="prefs_build_timestamp">Build timestamp: %1$s</string> + <string name="prefs_version">%1$s (%2$d)</string> + <string name="prefs_version_title">Version</string> + <string name="prefs_build_timestamp">%1$s</string> + <string name="prefs_build_timestamp_title">Build timestamp</string> <string name="crash_dialog_text">Unfortunately, Tiny Tiny RSS has stopped. Submit crash report to tt-rss.org?</string> </resources> diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index d37cef41..682224c1 100644 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -187,10 +187,10 @@ <Preference android:key="version" android:enabled="false" - android:title="@string/prefs_version" /> + android:title="@string/prefs_version_title" /> <Preference android:key="build_timestamp" android:enabled="false" - android:title="@string/prefs_build_timestamp" /> + android:title="@string/prefs_build_timestamp_title" /> </PreferenceScreen> |