Skip to content

Commit 44844e9

Browse files
akaitaakaita
authored
Merge pull request commons-app#6 from commons-app/master
Update to latest upstream
2 parents 0f98bca + 9722888 commit 44844e9

File tree

15 files changed

+338
-75
lines changed

15 files changed

+338
-75
lines changed

‎app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ protected String doInBackground(String... params) {
5858
protected void onPostExecute(String result) {
5959
super.onPostExecute(result);
6060
Timber.d("Login done!");
61+
6162
EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT)
6263
.param("username", username)
6364
.param("result", result)

‎app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package fr.free.nrw.commons.auth;
22

3-
import android.content.Intent;
43
import android.os.Bundle;
54
import android.webkit.WebSettings;
65
import android.webkit.WebView;
@@ -44,9 +43,8 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
4443
Toast.LENGTH_LONG
4544
);
4645
toast.show();
47-
48-
Intent intent = new Intent(CommonsApplication.getInstance(), LoginActivity.class);
49-
startActivity(intent);
46+
// terminate on task completion.
47+
finish();
5048
return true;
5149
} else {
5250
//If user clicks any other links in the webview

‎app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package fr.free.nrw.commons.theme;
22

3-
import android.accounts.Account;
4-
import android.accounts.AccountManager;
53
import android.content.ActivityNotFoundException;
64
import android.content.DialogInterface;
75
import android.content.Intent;
@@ -12,11 +10,9 @@
1210
import android.support.v7.app.ActionBarDrawerToggle;
1311
import android.support.v7.app.AlertDialog;
1412
import android.support.v7.widget.Toolbar;
15-
import android.util.Log;
1613
import android.view.MenuItem;
1714
import android.view.View;
1815
import android.view.ViewGroup;
19-
import android.widget.TextView;
2016
import android.widget.Toast;
2117

2218
import butterknife.BindView;
@@ -43,15 +39,9 @@ public class NavigationBaseActivity extends BaseActivity
4339
DrawerLayout drawerLayout;
4440

4541
private ActionBarDrawerToggle toggle;
46-
private String username;
47-
private TextView usernameTextView;
4842

4943
public void initDrawer() {
5044
navigationView.setNavigationItemSelectedListener(this);
51-
username = CommonsApplication.getInstance().getCurrentAccount().name;
52-
usernameTextView = ((TextView) navigationView.getHeaderView(0)
53-
.findViewById(R.id.userNameText));
54-
usernameTextView.setText(username != null ? username : "");
5545

5646
setSupportActionBar(toolbar);
5747
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

‎app/src/main/res/layout/drawer_header.xml

+5-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:orientation="vertical"
2+
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/pictureOfTheDay"
54
android:layout_width="match_parent"
5+
android:layout_height="172dp"
66
android:background="@android:color/darker_gray"
7-
android:layout_height="172dp">
8-
9-
<ImageView
10-
android:id="@+id/pictureOfTheDay"
11-
android:layout_width="match_parent"
12-
android:layout_height="0dp"
13-
android:layout_weight="0.8"
14-
android:paddingTop="5dp"
15-
android:src="@drawable/commons_logo_large" />
16-
17-
<TextView
18-
android:id="@+id/userNameText"
19-
style="?android:textAppearanceLargeInverse"
20-
android:layout_width="match_parent"
21-
android:layout_height="0dp"
22-
android:layout_weight="0.2"
23-
android:maxLines="1"
24-
android:textAlignment="center"
25-
android:text="@string/placeholder_place_name"
26-
android:textColor="@android:color/white" />
27-
</LinearLayout>
7+
android:padding="16dp"
8+
android:src="@drawable/commons_logo_large"/>

‎app/src/main/res/values-ast/strings.xml

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
<string name="menu_retry_upload">Reintentar</string>
8787
<string name="menu_cancel_upload">Encaboxar</string>
8888
<string name="share_license_summary">Esta imaxe quedará baxo la llicencia %1$s</string>
89+
<string name="media_upload_policy">El presentar esta imaxe, declaro que ye una obra propia, que nun contien material con derechu d\'autor o «selfies», y que s\'atien a les &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;polítiques de Wikimedia Commons&lt;/a&gt;.</string>
8990
<string name="menu_download">Descargar</string>
9091
<string name="preference_license">Llicencia</string>
9192
<string name="use_previous">Usar un títulu/descripción anterior</string>
@@ -191,4 +192,11 @@
191192
<string name="nearby_info_menu_commons_article">Páxina del ficheru en Commons</string>
192193
<string name="nearby_info_menu_wikidata_article">Elementu de WikiData</string>
193194
<string name="error_while_cache">Error al poner les fotos na caché</string>
195+
<string name="title_info">Un títulu descriptivu únicu pal ficheru, que sirvirá para da-y nome al ficheru. Se pue usar llinguax normal con espacios. Nun amiestes la estensión del ficheru</string>
196+
<string name="description_info">Por favor, describi l\'elementu multimedia tantu como sía posible: ¿ónde se tomó?, ¿qué amuesa?, ¿cuál ye\'l contestu? Por favor, describi los oxetos o persones. Revela la información que nun pueda aldovinase de mou cenciellu, por casu el momentu del día si ye un paisaxe. Si\'l mediu amuesa daqué desacostumao, esplica qué lo fai raro.</string>
197+
<string name="feedback_popup_title">Agradecemos opiniones</string>
198+
<string name="feedback_popup_description">Tamos planificando delles carauterístiques y ameyoramientos nuevos pa l\'aplicación. ¿Prestaríate revisales y dar la to opinión?\n\n(Siempres puedas aportar a esto escoyendo «Planes de los desendolcadores» nel caxón de navegación)</string>
199+
<string name="feedback_popup_decline">Non, gracies</string>
200+
<string name="feedback_popup_accept">Claro, ¡llévame ende!</string>
201+
<string name="navigation_item_developer_plans">Planes de los desendolcadores</string>
194202
</resources>

‎app/src/main/res/values-csb/error.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="crash_dialog_title">Pókôza sã fela Commons.</string>
4+
<string name="crash_dialog_text">Wejle! Cos je lëchò pòszłé!</string>
5+
<string name="crash_dialog_comment_prompt">Dôj nam wiédzã ò tim co të zrobił/-a sélając e-mailã. To nama pómòże naprôwic nã felã.</string>
6+
<string name="crash_dialog_ok_toast">Dzãkùjemë!</string>
7+
</resources>

‎app/src/main/res/values-csb/strings.xml

+24
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<string name="login_failed_network">Ni mòże sã wlogòwac - fela sécë</string>
4141
<string name="login_failed_username">Ni mòże sã wlogòwac - sprôwdzë miono brëkòwnika</string>
4242
<string name="login_failed_password">Ni mòże sã wlogòwac - sprôwdzë parolã</string>
43+
<string name="login_failed_throttled">Za wiele nieùdałich prób wlogòwaniô. Spróbùjë znowa za czile minut.</string>
44+
<string name="login_failed_blocked">Nen brëkòwnik òstôł zablokòwóny na Commons</string>
45+
<string name="login_failed_2fa_needed">Mùszisz wpisac swój kòd dlô dwafaktorowi aùtorizacëji.</string>
4346
<string name="login_failed_generic">Logòwanié nie darzëło sã</string>
4447
<string name="share_upload_button">Wladënk</string>
4548
<string name="multiple_share_base_title">Miono tegò zestôwù</string>
@@ -48,6 +51,7 @@
4851
<string name="categories_search_text_hint">Szëkba kategòrëjów</string>
4952
<string name="menu_save_categories">Zapiszë:</string>
5053
<string name="refresh_button">Òdswierzë</string>
54+
<string name="gps_disabled">GPS je w twòjim ùrządzeniém wëłączony. Chcesz gò włączëc?</string>
5155
<string name="enable_gps">Wëłączë GPS</string>
5256
<string name="contributions_subtitle_zero">Nie dô jesz wladënków</string>
5357
<plurals name="contributions_subtitle">
@@ -68,6 +72,8 @@
6872
<string name="title_activity_settings">Nastôwë</string>
6973
<string name="title_activity_signup">Wregistrëjë sã</string>
7074
<string name="menu_about">Ò aplikacëji</string>
75+
<string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pòlitika priwatnotë&lt;/a&gt;</string>
76+
<string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Ùsôdzcë&lt;/a&gt;</string>
7177
<string name="title_activity_about">Ò aplikacëji</string>
7278
<string name="menu_feedback">Sélôj òpinijã (przez e-mail)</string>
7379
<string name="no_email_client">Felënk wjinstalowónegò e-mailowégò klienta</string>
@@ -126,6 +132,20 @@
126132
<string name="become_a_tester_title">Bãdze beta-testerã</string>
127133
<string name="use_wikidata">Ùżëjë Wikipòdôwków</string>
128134
<string name="_2fa_code">Kòd 2FA</string>
135+
<string name="logout_verification">Pò prôwdze chcesz sã wëlogòwac?</string>
136+
<string name="commons_logo">Logò Commons</string>
137+
<string name="background_image">Òbrôzk spódkù</string>
138+
<string name="no_image_found">Felënk òbrôzka</string>
139+
<string name="upload_image">Waldëjë òbrôzk</string>
140+
<string name="welcome_image_mount_zao">Zaō</string>
141+
<string name="welcome_image_llamas">Lamy</string>
142+
<string name="welcome_image_rainbow_bridge">Rainbow Bridge</string>
143+
<string name="welcome_image_tulip">Tulpa</string>
144+
<string name="welcome_image_no_selfies">Felënk \"selfies\"</string>
145+
<string name="welcome_image_proprietary">Zazychrowóny òbrôzk</string>
146+
<string name="welcome_image_welcome_wikipedia">Witôj na Wikipediji</string>
147+
<string name="welcome_image_welcome_copyright">Witôj w prawnych zastrzégach</string>
148+
<string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
129149
<string name="cancel">Òprzestóń</string>
130150
<string name="navigation_drawer_open">Òtemkni</string>
131151
<string name="navigation_drawer_close">Zamkni</string>
@@ -136,5 +156,9 @@
136156
<string name="navigation_item_settings">Nastôwë</string>
137157
<string name="navigation_item_feedback">Òpinije</string>
138158
<string name="navigation_item_logout">Wëlogùjë</string>
159+
<string name="navigation_item_info">Samòùczk</string>
160+
<string name="no_description_found">felënk òpisënka</string>
161+
<string name="nearby_info_menu_commons_article">Starna lopka w Commons</string>
162+
<string name="nearby_info_menu_wikidata_article">Element Wikipòdôwków</string>
139163
<string name="feedback_popup_decline">Nié, dzãkùjã</string>
140164
</resources>

‎app/src/main/res/values-fi/strings.xml

+10-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string name="upload_progress_notification_title_finishing">%1$s tallennettu</string>
2121
<string name="upload_failed_notification_title">Tiedoston %1$s tallentaminen epäonnistui</string>
2222
<string name="upload_failed_notification_subtitle">Napauta katsoaksesi</string>
23-
<plurals name="uploads_pending_notification_indicator" fuzzy="true">
23+
<plurals name="uploads_pending_notification_indicator">
2424
<item quantity="one">1 tiedosto tallentuu</item>
2525
<item quantity="other">%d tiedostoa tallentuu</item>
2626
</plurals>
@@ -145,10 +145,17 @@
145145
<string name="media_detail_media_title">Median otsikko</string>
146146
<string name="media_detail_description">Kuvaus</string>
147147
<string name="media_detail_uploaded_date">Tallennuspäivämäärä</string>
148+
<string name="media_detail_license">Lisenssi</string>
149+
<string name="media_detail_coordinates">Koordinaatit</string>
148150
<string name="become_a_tester_title">Ryhdy beetatestaajaksi</string>
149151
<string name="use_wikidata">Käytä Wikidataa</string>
150152
<string name="login_failed_2fa_not_supported">Kaksivaiheinen tunnistus ei ole vielä tuettu.</string>
151153
<string name="logout_verification">Haluatko kirjautua ulos?</string>
154+
<string name="upload_image">Lataa kuva</string>
155+
<string name="welcome_image_tulip">Tulppaani</string>
156+
<string name="welcome_image_no_selfies">Ei selfieitä</string>
157+
<string name="welcome_image_welcome_wikipedia">Tervetuloa Wikipediaan</string>
158+
<string name="welcome_image_sydney_opera_house">Sydneyn oopperatalo</string>
152159
<string name="cancel">Peru</string>
153160
<string name="navigation_drawer_open">Avaa</string>
154161
<string name="navigation_drawer_close">Sulje</string>
@@ -159,6 +166,7 @@
159166
<string name="navigation_item_settings">Asetukset</string>
160167
<string name="navigation_item_feedback">Palaute</string>
161168
<string name="navigation_item_logout">Kirjaudu ulos</string>
162-
<string name="nearby_info_menu_commons_article" fuzzy="true">Commons-artikkeli</string>
169+
<string name="nearby_info_menu_commons_article">Commons-tiedostosivu</string>
163170
<string name="nearby_info_menu_wikidata_article">Wikidata-kohde</string>
171+
<string name="feedback_popup_decline">Ei kiitos</string>
164172
</resources>

‎app/src/main/res/values-kab/error.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="crash_dialog_title">Commons yeɣli</string>
4+
<string name="crash_dialog_text">Ihuh. Yella wayen yeḍran!</string>
5+
<string name="crash_dialog_comment_prompt">Ini-yaɣ-d ayen txeddmed, sakin bḍu-t s yimayl yid-neɣ. Aɣ-d-yefk afus akken ad t-nṣeggem.</string>
6+
<string name="crash_dialog_ok_toast">Tanemmirt!</string>
7+
</resources>

0 commit comments

Comments
 (0)