Skip to content
This repository was archived by the owner on Jul 5, 2018. It is now read-only.

Commit eb46bba

Browse files
awjrichards-zzawjrichards-zz
committed
Merge branch 'master' of https://github.com/wikimedia/WLMMobile into commons-upload
2 parents b1688e9 + 68e54d2 commit eb46bba

File tree

9 files changed

+46
-7
lines changed

9 files changed

+46
-7
lines changed

‎.classpath‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="gen"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7+
<classpathentry kind="output" path="bin/classes"/>
8+
</classpath>

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bin/*
2+
gen/*

‎.project‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.wikipedia.wlm.WikiLovesMonuments</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.jdt.core.javabuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>

‎AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
3-
package="org.wikipedia.wlm" android:versionName="1.2.3" android:versionCode="10" android:installLocation="auto">
3+
package="org.wikipedia.wlm" android:versionName="1.2.3-1" android:versionCode="11" android:installLocation="auto">
44
<supports-screens
55
android:largeScreens="true"
66
android:normalScreens="true"

‎assets/www/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ <h3><msg key="confirm-license-title" /></h3>
172172
return encodeURIComponent( cat );
173173
} );
174174
print(encodedCats.join("|"));
175-
%> <%= mw.message('upload-more-link') %>]
175+
%> {{upload-more-photos-of-this-monument}}]
176176

177177
=={{int:license-header}}==
178178
{{self|<%= descData.license %>}}

‎assets/www/js/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var WLMConfig = {
99
WIKI_LOVES_MONUMENTS_HOMEPAGE: 'http://www.wikilovesmonuments.org/',
1010
WIKIPEDIA: 'https://$1.wikipedia.org',
1111
WIKIPEDIA_API: 'https://$1.wikipedia.org/w/api.php',
12-
VERSION_NUMBER: '1.2.3',
12+
VERSION_NUMBER: '1.2.3-1',
1313
VERSION_NAME: 'Colosseum', // famous monument name (next should begin with D)
1414

1515
// app specific

‎assets/www/messages/messages-en.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ placeholder-username=Username
149149
placeholder-password=Password
150150
settings-user-name=You are <strong>$1</strong>!
151151
152-
upload-more-link=Upload more photos of this monument
153-
154152
about=About this game
155153
about-wlm-p1=<p><a href="$1">Wiki Loves Monuments</a> is the exciting international photo contest for monuments in which you can participate. It is organised by Wikimedia, the movement behind a little encyclopedia you might have heard of called <a href="$2">Wikipedia</a>.</p><p>Cultural heritage is an important part of the knowledge that Wikipedia strives to share with the world.</p><p>You can help its growth by contributing photos of monuments in your area using this easy to use mobile application.</p>
156154
about-app-header=Version Information

‎assets/www/messages/messages-nl.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ settings-logout=Afmelden
122122
placeholder-username=Gebruikersnaam
123123
placeholder-password=Wachtwoord
124124
settings-user-name=U bent <strong>$1</strong>!
125-
upload-more-link=Meer afbeeldingen van dit monument uploaden
126125
about=Over dit spel
127126
about-wlm-p1=<p><a href="$1">Wiki Loves Monuments</a> is de spannende internationale fotowedstrijd voor monumenten waar u aan kunt deelnemen. De wedstrijd wordt georganiseerd door Wikimedia, de beweging achter een kleine encyclopedia waar u misschien wel eens van gehoord hebt, <a href="$2">Wikipedia</a>.</p><p>Cultureel erfgoed is een belangrijk onderdeel van de kennis die Wikipedia wil delen met de wereld.</p><p>U kunt helpen met het laten groeien van Wikipedia door foto's van monumenten bij u in de buurt bij te dragen met deze eenvoudig te gebruiken mobiele toepassing.</p>
128127
about-app-header=Versie-informatie

‎assets/www/messages/messages-qqq.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ settings-logout=Label for log out button.
131131
placeholder-username=Prompt for username in login screen.
132132
placeholder-password=Prompt for password in login screen.
133133
settings-user-name=Informational HTML text on the settings screen after logging in. $1 is current wiki username.
134-
upload-more-link=Link text inserted into description pages that sends user to UploadWizard with appropriate parameters to upload more photos of the same monument on the desktop.
135134
about=Heading for the about page.
136135
about-wlm-p1=An HTML/text string that describes the game.
137136
about-app-header=Information about the app itself

0 commit comments

Comments
 (0)