Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-12-07 15:06:06 +01:00
commit 6ec7cbb884
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/build.xml
View file

@ -205,7 +205,14 @@
<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;([^#]+)(.*)&lt;' replace='"app_version"&gt;\1${build.version}&lt;' byline="true" />
</then>
</if>
<if>
<condition>
<isset property="app.edition" />
</condition>
<then>
<replaceregexp file="res/values/no_translate.xml" match='"app_edition"&gt;(.*)&lt;' replace='"app_edition"&gt;${app.edition}&lt;' byline="true" />
</then>
</if>
</target>

1
OsmAnd/res/values/no_translate.xml
View file

@ -35,4 +35,5 @@
\n\tPavol Zibrita - first contributor and developer of some utilities
\n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
</string>
<string name="app_edition"></string>
</resources>

6
OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
View file

@ -201,8 +201,10 @@ public class DashboardActivity extends BaseDownloadActivity {
try {
PackageManager pm = activity.getPackageManager();
ApplicationInfo appInfo = pm.getApplicationInfo(OsmandApplication.class.getPackage().getName(), 0);
Date date = new Date(new File(appInfo.sourceDir).lastModified());
edition = activity.getString(R.string.local_index_installed) + " : \t" + DateFormat.getDateFormat(app).format(date);
//Next line produced bogus dates in man situtations, let us try to use the BUILD_ID here as delivered from builder
//Date date = new Date(new File(appInfo.sourceDir).lastModified());
//edition = activity.getString(R.string.local_index_installed) + " : \t" + DateFormat.getDateFormat(app).format(date);
edition = activity.getString(R.string.local_index_installed) + " : \t" + activity.getString(R.string.app_edition);
} catch (Exception e) {
}
SpannableString content = new SpannableString(vt + version +"\n" +