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-06 20:40:16 +01:00
commit 8869b69240
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/build.xml
View file

@ -200,7 +200,7 @@
<isset property="build.version" />
</condition>
<then>
<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;(.*)&lt;' replace='"app_version"&gt;1.9.4${build.version}&lt;' byline="true" />
<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;(.*)&lt;' replace='"app_version"&gt;\1${build.version}&lt;' byline="true" />
</then>
</if>

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

@ -4,9 +4,11 @@
<string name="app_name_ver">OsmAnd 1.9.3</string>
<string name="app_version">1.9.3</string>
<!--
Note: The above app_version should also provided as the build number prefix ('based-on version') to our dev APKs via the builder configs, e.g.
http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main/configure ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}M )
MUST BE KEPT IN SYNC THERE MANUALLY!
Note: For our dev build apk's, the above app_version should be provided as the base version prefix to our build number in the format: X.X.X#BUILD+BRANCH
To achieve this, keep the value of app_version in sync with
file: osmand/build.xml'
line: <replaceregexp file="res/values/no_translate.xml" ...
item X.X.X in: replace='"app_version"&gt;X.X.X${build.version}&lt;'
-->
<!-- Not translatable -->