Merge pull request commons-app#6 from commons-app/master

Update to latest upstream
ajuancer · Aug 18, 2017 · 44844e9 · 44844e9
2 parents 0f98bca + 9722888
commit 44844e9
Show file tree

Hide file tree

Showing 15 changed files with 338 additions and 75 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
@@ -58,6 +58,7 @@ protected String doInBackground(String... params) {
     protected void onPostExecute(String result) {
         super.onPostExecute(result);
         Timber.d("Login done!");
+
         EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT)
                 .param("username", username)
                 .param("result", result)

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.auth;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -44,9 +43,8 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                         Toast.LENGTH_LONG
                 );
                 toast.show();
-
-                Intent intent = new Intent(CommonsApplication.getInstance(), LoginActivity.class);
-                startActivity(intent);
+                // terminate on task completion.
+                finish();
                 return true;
             } else {
                 //If user clicks any other links in the webview

diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.theme;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -12,11 +10,9 @@
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import butterknife.BindView;
@@ -43,15 +39,9 @@ public class NavigationBaseActivity extends BaseActivity
     DrawerLayout drawerLayout;
 
     private ActionBarDrawerToggle toggle;
-    private String username;
-    private TextView usernameTextView;
 
     public void initDrawer() {
         navigationView.setNavigationItemSelectedListener(this);
-        username = CommonsApplication.getInstance().getCurrentAccount().name;
-        usernameTextView = ((TextView) navigationView.getHeaderView(0)
-                .findViewById(R.id.userNameText));
-        usernameTextView.setText(username != null ? username : "");
 
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);

diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
@@ -1,27 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pictureOfTheDay"
     android:layout_width="match_parent"
+    android:layout_height="172dp"
     android:background="@android:color/darker_gray"
-    android:layout_height="172dp">
-
-    <ImageView
-        android:id="@+id/pictureOfTheDay"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.8"
-        android:paddingTop="5dp"
-        android:src="@drawable/commons_logo_large" />
-
-    <TextView
-        android:id="@+id/userNameText"
-        style="?android:textAppearanceLargeInverse"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.2"
-        android:maxLines="1"
-        android:textAlignment="center"
-        android:text="@string/placeholder_place_name"
-        android:textColor="@android:color/white" />
-</LinearLayout>
+    android:padding="16dp"
+    android:src="@drawable/commons_logo_large"/>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
@@ -86,6 +86,7 @@
   <string name="menu_retry_upload">Reintentar</string>
   <string name="menu_cancel_upload">Encaboxar</string>
   <string name="share_license_summary">Esta imaxe quedará baxo la llicencia %1$s</string>
+  <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>
   <string name="menu_download">Descargar</string>
   <string name="preference_license">Llicencia</string>
   <string name="use_previous">Usar un títulu/descripción anterior</string>
@@ -191,4 +192,11 @@
   <string name="nearby_info_menu_commons_article">Páxina del ficheru en Commons</string>
   <string name="nearby_info_menu_wikidata_article">Elementu de WikiData</string>
   <string name="error_while_cache">Error al poner les fotos na caché</string>
+  <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>
+  <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>
+  <string name="feedback_popup_title">Agradecemos opiniones</string>
+  <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>
+  <string name="feedback_popup_decline">Non, gracies</string>
+  <string name="feedback_popup_accept">Claro, ¡llévame ende!</string>
+  <string name="navigation_item_developer_plans">Planes de los desendolcadores</string>
 </resources>
diff --git a/app/src/main/res/values-csb/error.xml b/app/src/main/res/values-csb/error.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="crash_dialog_title">Pókôza sã fela Commons.</string>
+  <string name="crash_dialog_text">Wejle! Cos je lëchò  pòszłé!</string>
+  <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>
+  <string name="crash_dialog_ok_toast">Dzãkùjemë!</string>
+</resources>
diff --git a/app/src/main/res/values-csb/strings.xml b/app/src/main/res/values-csb/strings.xml
@@ -40,6 +40,9 @@
   <string name="login_failed_network">Ni mòże sã wlogòwac - fela sécë</string>
   <string name="login_failed_username">Ni mòże sã wlogòwac - sprôwdzë miono brëkòwnika</string>
   <string name="login_failed_password">Ni mòże sã wlogòwac - sprôwdzë parolã</string>
+  <string name="login_failed_throttled">Za wiele nieùdałich prób wlogòwaniô. Spróbùjë znowa za czile minut.</string>
+  <string name="login_failed_blocked">Nen brëkòwnik òstôł zablokòwóny na Commons</string>
+  <string name="login_failed_2fa_needed">Mùszisz wpisac swój kòd dlô dwafaktorowi aùtorizacëji.</string>
   <string name="login_failed_generic">Logòwanié nie darzëło sã</string>
   <string name="share_upload_button">Wladënk</string>
   <string name="multiple_share_base_title">Miono tegò zestôwù</string>
@@ -48,6 +51,7 @@
   <string name="categories_search_text_hint">Szëkba kategòrëjów</string>
   <string name="menu_save_categories">Zapiszë:</string>
   <string name="refresh_button">Òdswierzë</string>
+  <string name="gps_disabled">GPS je w twòjim ùrządzeniém wëłączony. Chcesz gò włączëc?</string>
   <string name="enable_gps">Wëłączë GPS</string>
   <string name="contributions_subtitle_zero">Nie dô jesz wladënków</string>
   <plurals name="contributions_subtitle">
@@ -68,6 +72,8 @@
   <string name="title_activity_settings">Nastôwë</string>
   <string name="title_activity_signup">Wregistrëjë sã</string>
   <string name="menu_about">Ò aplikacëji</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Pòlitika priwatnotë&lt;/a&gt;</string>
+  <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>
   <string name="title_activity_about">Ò aplikacëji</string>
   <string name="menu_feedback">Sélôj òpinijã (przez e-mail)</string>
   <string name="no_email_client">Felënk wjinstalowónegò e-mailowégò klienta</string>
@@ -126,6 +132,20 @@
   <string name="become_a_tester_title">Bãdze beta-testerã</string>
   <string name="use_wikidata">Ùżëjë Wikipòdôwków</string>
   <string name="_2fa_code">Kòd 2FA</string>
+  <string name="logout_verification">Pò prôwdze chcesz sã wëlogòwac?</string>
+  <string name="commons_logo">Logò Commons</string>
+  <string name="background_image">Òbrôzk spódkù</string>
+  <string name="no_image_found">Felënk òbrôzka</string>
+  <string name="upload_image">Waldëjë òbrôzk</string>
+  <string name="welcome_image_mount_zao">Zaō</string>
+  <string name="welcome_image_llamas">Lamy</string>
+  <string name="welcome_image_rainbow_bridge">Rainbow Bridge</string>
+  <string name="welcome_image_tulip">Tulpa</string>
+  <string name="welcome_image_no_selfies">Felënk \"selfies\"</string>
+  <string name="welcome_image_proprietary">Zazychrowóny òbrôzk</string>
+  <string name="welcome_image_welcome_wikipedia">Witôj na Wikipediji</string>
+  <string name="welcome_image_welcome_copyright">Witôj w prawnych zastrzégach</string>
+  <string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
   <string name="cancel">Òprzestóń</string>
   <string name="navigation_drawer_open">Òtemkni</string>
   <string name="navigation_drawer_close">Zamkni</string>
@@ -136,5 +156,9 @@
   <string name="navigation_item_settings">Nastôwë</string>
   <string name="navigation_item_feedback">Òpinije</string>
   <string name="navigation_item_logout">Wëlogùjë</string>
+  <string name="navigation_item_info">Samòùczk</string>
+  <string name="no_description_found">felënk òpisënka</string>
+  <string name="nearby_info_menu_commons_article">Starna lopka w Commons</string>
+  <string name="nearby_info_menu_wikidata_article">Element Wikipòdôwków</string>
   <string name="feedback_popup_decline">Nié, dzãkùjã</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing">%1$s tallennettu</string>
   <string name="upload_failed_notification_title">Tiedoston %1$s tallentaminen epäonnistui</string>
   <string name="upload_failed_notification_subtitle">Napauta katsoaksesi</string>
-  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+  <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 tiedosto tallentuu</item>
     <item quantity="other">%d tiedostoa tallentuu</item>
   </plurals>
@@ -145,10 +145,17 @@
   <string name="media_detail_media_title">Median otsikko</string>
   <string name="media_detail_description">Kuvaus</string>
   <string name="media_detail_uploaded_date">Tallennuspäivämäärä</string>
+  <string name="media_detail_license">Lisenssi</string>
+  <string name="media_detail_coordinates">Koordinaatit</string>
   <string name="become_a_tester_title">Ryhdy beetatestaajaksi</string>
   <string name="use_wikidata">Käytä Wikidataa</string>
   <string name="login_failed_2fa_not_supported">Kaksivaiheinen tunnistus ei ole vielä tuettu.</string>
   <string name="logout_verification">Haluatko kirjautua ulos?</string>
+  <string name="upload_image">Lataa kuva</string>
+  <string name="welcome_image_tulip">Tulppaani</string>
+  <string name="welcome_image_no_selfies">Ei selfieitä</string>
+  <string name="welcome_image_welcome_wikipedia">Tervetuloa Wikipediaan</string>
+  <string name="welcome_image_sydney_opera_house">Sydneyn oopperatalo</string>
   <string name="cancel">Peru</string>
   <string name="navigation_drawer_open">Avaa</string>
   <string name="navigation_drawer_close">Sulje</string>
@@ -159,6 +166,7 @@
   <string name="navigation_item_settings">Asetukset</string>
   <string name="navigation_item_feedback">Palaute</string>
   <string name="navigation_item_logout">Kirjaudu ulos</string>
-  <string name="nearby_info_menu_commons_article" fuzzy="true">Commons-artikkeli</string>
+  <string name="nearby_info_menu_commons_article">Commons-tiedostosivu</string>
   <string name="nearby_info_menu_wikidata_article">Wikidata-kohde</string>
+  <string name="feedback_popup_decline">Ei kiitos</string>
 </resources>
diff --git a/app/src/main/res/values-kab/error.xml b/app/src/main/res/values-kab/error.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="crash_dialog_title">Commons yeɣli</string>
+  <string name="crash_dialog_text">Ihuh. Yella wayen yeḍran!</string>
+  <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>
+  <string name="crash_dialog_ok_toast">Tanemmirt!</string>
+</resources>