From 757a198c99c81132a315318d6fc459823f45f0f1 Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Sun, 11 Mar 2018 16:57:49 +0530 Subject: [PATCH 1/5] translate url added --- .../main/java/fr/free/nrw/commons/AboutActivity.java | 2 ++ app/src/main/res/layout/activity_about.xml | 10 ++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 13 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 895190003..0f0d0f543 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -87,8 +87,10 @@ public class AboutActivity extends NavigationBaseActivity { Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\")); } + @OnClick(R.id.about_faq) public void launchFrequentlyAskedQuesions(View view) { Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\")); } + } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index f4a295d95..9551e6e64 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -123,6 +123,16 @@ android:gravity="center" android:text="@string/about_privacy_policy" /> + + Rate Us Frequently Asked Questions Skip Tutorial + From a6a30e1e77e31bb9dbc41941c0369b8ffccd8bf4 Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Sun, 11 Mar 2018 19:34:46 +0530 Subject: [PATCH 2/5] Fixed Merge conflict --- app/src/main/java/fr/free/nrw/commons/AboutActivity.java | 1 + app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 0f0d0f543..0ee445785 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -92,5 +92,6 @@ public class AboutActivity extends NavigationBaseActivity { public void launchFrequentlyAskedQuesions(View view) { Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\")); } + } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d2507c80..e20c1542b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -245,5 +245,6 @@ Rate Us Frequently Asked Questions Skip Tutorial + Translate From 7e081799ed9bd37ba1931f97f95a00de2909a83c Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Fri, 16 Mar 2018 19:55:11 +0530 Subject: [PATCH 3/5] Languages token hashmap added --- .../fr/free/nrw/commons/AboutActivity.java | 10 ++ .../free/nrw/commons/TokensTranslations.java | 108 ++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 app/src/main/java/fr/free/nrw/commons/TokensTranslations.java diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 0ee445785..cbd3816e8 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -29,6 +29,16 @@ public class AboutActivity extends NavigationBaseActivity { @BindView(R.id.about_license) HtmlTextView aboutLicenseText; @BindView(R.id.about_faq) TextView faqText; + String language[] = { "Kazakh", "Afrikaans", "Arabic", "Bengali", "Asturianu", "azərbaycanca", "Bikol Central", + "Bulgarain", "বাংলা", "Bosanski", "Brezhoneg","català","کوردی", " čeština", " kaszëbsczi", "Cymraeg", "dansk", "Deutsch" + ,"Zazaki", "डोटेली","Ελληνικά","euskara","español","فارسی","suomi", "français" ,"Nordfriisk", "galego", "Hawaiʻi" + ,"हिन्दी","Hunsrik","עברית","hornjoserbsce","magyar","interlingua","Bahasa Indonesia", "íslenska","Italian","japanese", + "Basa Jawa", "ქართული", " ភាសាខ្មែរ","ಕನ್ನಡ", "한국어","къарачай-малкъар","Кыргызча", "latina", "Lëtzebuergesch", "lietuvių", + "latviešu", "Malagasy", "македонски"," മലയാളം","монгол","मराठी","Bahasa Melayu","Malti", "नेपाली", "norsk bokmål", + " Nederlands","occitan","ଓଡ଼ିଆ","ਪੰਜਾਬੀ","polsk","Piemontèis","پښتو","português","română","русский"," سنڌي", " සිංහල", + "slovenčina"," سرائیکی", "svenska", "தமிழ்", "ತುಳು"," తెలుగు"," ไทย", "Türkçe","українська", "اردو", "Tiếng Việt", + " მარგალური","ייִדיש",}; + /** * This method helps in the creation About screen * diff --git a/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java b/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java new file mode 100644 index 000000000..4edc29810 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java @@ -0,0 +1,108 @@ +package fr.free.nrw.commons; + +import java.util.HashMap; + +/** + * Created by Dell on 3/16/2018. + */ + +public class TokensTranslations { + private static HashMap translationToken; + private static HashMap License_selectionToken; + + TokensTranslations() { + translationToken.put("Kazakh", "ab"); + translationToken.put("Afrikaans", "af"); + translationToken.put("Arabic", "ar"); + translationToken.put("Bengali", "as"); + translationToken.put("Asturianu", "ast"); + translationToken.put("azərbaycanca", "az"); + translationToken.put("Bikol Central", "bcl"); + translationToken.put("Bulgarain","bg"); + translationToken.put("বাংলা", "bn"); + translationToken.put("Brezhoneg", "br"); + translationToken.put("Bosanski", "bs"); + translationToken.put("català", "ca"); + translationToken.put("کوردی","ckb"); + translationToken.put("čeština", "cs"); + translationToken.put("kaszëbsczi", "csb"); + translationToken.put("Cymraeg", "cy"); + translationToken.put("dansk", "da"); + translationToken.put("Deutsch", "de"); + translationToken.put("Zazaki", "diq"); + translationToken.put("डोटेली","diq"); + translationToken.put("Ελληνικά","el"); + translationToken.put("euskara","eu"); + translationToken.put("español", "es"); + translationToken.put("فارسی","fa"); + translationToken.put("suomi", "fi"); + translationToken.put("føroyskt", "fo"); + translationToken.put("français", "fr"); + translationToken.put("Nordfriisk", "frr"); + translationToken.put("galego", "gr"); + translationToken.put("Hawaiʻi", "haw"); + translationToken.put("עברית","he"); + translationToken.put("हिन्दी","hi"); + translationToken.put("Hunsrik", "hrx"); + translationToken.put("hornjoserbsce", "hsb"); + translationToken.put("magyar","hu"); + translationToken.put("interlingua","ia"); + translationToken.put("Bahasa Indonesia", "id"); + translationToken.put("íslenska","is"); + translationToken.put("Italian","it"); + translationToken.put("japanese","ja"); + translationToken.put("Basa Jawa","jv"); + translationToken.put("ქართული", "ka"); + translationToken.put("Taqbaylit","kab"); + translationToken.put(" ភាសាខ្មែរ","km"); + translationToken.put("ಕನ್ನಡ", "kn"); + translationToken.put("한국어", "ko"); + translationToken.put("къарачай-малкъар","krc"); + translationToken.put("Кыргызча","ky"); + translationToken.put("latina","la"); + translationToken.put("Lëtzebuergesch","lb"); + translationToken.put("lietuvių", "lt"); + translationToken.put("latviešu","lv"); + translationToken.put("Malagasy","mg"); + translationToken.put("македонски", "mk"); + translationToken.put("മലയാളം","ml"); + translationToken.put("монгол","mn"); + translationToken.put("मराठी","mr"); + translationToken.put("Bahasa Melayu","ms"); + translationToken.put("Malti","mt"); + translationToken.put("norsk bokmål", "nb"); + translationToken.put("नेपाली","ne"); + translationToken.put("Nederlands","nl"); + translationToken.put("occitan","oc"); + translationToken.put("ଓଡ଼ିଆ","or"); + translationToken.put("ਪੰਜਾਬੀ","pa"); + translationToken.put("polsk", "pl"); + translationToken.put("Piemontèis","pms"); + translationToken.put("پښتو","ps"); + translationToken.put("português","pt"); + translationToken.put("română","ro"); + translationToken.put("русский","ru"); + translationToken.put(" سنڌي","sd"); + translationToken.put(" සිංහල","si"); + translationToken.put("slovenčina","sk"); + translationToken.put(" سرائیکی","skr"); + translationToken.put("Basa Sunda","su"); + translationToken.put("svenska","sv"); + translationToken.put("தமிழ்", "ta"); + translationToken.put("ತುಳು", "tcy"); + translationToken.put(" తెలుగు","te"); + translationToken.put(" ไทย","th"); + translationToken.put("Türkçe","tr"); + translationToken.put("українська","uk"); + translationToken.put("اردو","ur"); + translationToken.put("Tiếng Việt","vi"); + translationToken.put(" მარგალური", "xmf"); + translationToken.put("ייִדיש","yi"); + translationToken.put(); + translationToken.put(); + translationToken.put(); + translationToken.put(); + translationToken.put(); + + } +} From 2e064c370a46cd5e90e1f93d06c23915f5eeab9d Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Fri, 16 Mar 2018 20:42:19 +0530 Subject: [PATCH 4/5] Alert Dialoge Implemented --- .../fr/free/nrw/commons/AboutActivity.java | 38 ++++++++++++++++++- .../free/nrw/commons/TokensTranslations.java | 9 ++--- app/src/main/res/values/strings.xml | 4 ++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index cbd3816e8..f0dcc9971 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -1,6 +1,8 @@ package fr.free.nrw.commons; import android.annotation.SuppressLint; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -10,6 +12,9 @@ import android.util.Log; import android.support.customtabs.CustomTabsIntent; import android.support.v4.content.ContextCompat; import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.LinearLayout; +import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -102,6 +107,37 @@ public class AboutActivity extends NavigationBaseActivity { public void launchFrequentlyAskedQuesions(View view) { Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\")); } - + + @OnClick(R.id.about_translate) + public void launchTranslate(View view) { + final ArrayAdapter languageAdapter = new ArrayAdapter(AboutActivity.this, + android.R.layout.simple_spinner_item, language); + final Spinner spinner = new Spinner(AboutActivity.this); + spinner.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)); + spinner.setAdapter(languageAdapter); + spinner.setGravity(17); + + AlertDialog.Builder builder = new AlertDialog.Builder(AboutActivity.this); + builder.setView(spinner); + builder.setTitle(R.string.about_translate_title) + .setMessage(R.string.about_translate_message) + .setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + String languageSelected = spinner.getSelectedItem().toString(); + TokensTranslations tokensTranslations = new TokensTranslations(); + String token = tokensTranslations.getTranslationToken(languageSelected); + Utils.handleWebUrl(AboutActivity.this,Uri.parse("https://translatewiki.net/w/i.php?title=Special:Translate&language="+token+"&group=commons-android-strings&filter=%21translated&action=translate ?")); + } + }); + builder.setNegativeButton(R.string.about_translate_cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + finish(); + } + }); + builder.create().show(); + + } } diff --git a/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java b/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java index 4edc29810..9d1c5c4fb 100644 --- a/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java +++ b/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java @@ -8,7 +8,6 @@ import java.util.HashMap; public class TokensTranslations { private static HashMap translationToken; - private static HashMap License_selectionToken; TokensTranslations() { translationToken.put("Kazakh", "ab"); @@ -98,11 +97,9 @@ public class TokensTranslations { translationToken.put("Tiếng Việt","vi"); translationToken.put(" მარგალური", "xmf"); translationToken.put("ייִדיש","yi"); - translationToken.put(); - translationToken.put(); - translationToken.put(); - translationToken.put(); - translationToken.put(); + } + public String getTranslationToken ( String language){ + return translationToken.get(language); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e20c1542b..725d24850 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -246,5 +246,9 @@ Frequently Asked Questions Skip Tutorial Translate + Languages + Select the langauge you want translations for ? + Proceed + Cancel From 1b1568d15e5952e49813e9df3cb97610e2c23d48 Mon Sep 17 00:00:00 2001 From: tanvidadu Date: Sat, 17 Mar 2018 09:50:05 +0530 Subject: [PATCH 5/5] Added the functionality --- app/src/main/java/fr/free/nrw/commons/AboutActivity.java | 1 + app/src/main/java/fr/free/nrw/commons/TokensTranslations.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index f0dcc9971..ecf4c21f0 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -126,6 +126,7 @@ public class AboutActivity extends NavigationBaseActivity { public void onClick(DialogInterface dialog, int which) { String languageSelected = spinner.getSelectedItem().toString(); TokensTranslations tokensTranslations = new TokensTranslations(); + tokensTranslations.initailize(); String token = tokensTranslations.getTranslationToken(languageSelected); Utils.handleWebUrl(AboutActivity.this,Uri.parse("https://translatewiki.net/w/i.php?title=Special:Translate&language="+token+"&group=commons-android-strings&filter=%21translated&action=translate ?")); } diff --git a/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java b/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java index 9d1c5c4fb..92278b6e9 100644 --- a/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java +++ b/app/src/main/java/fr/free/nrw/commons/TokensTranslations.java @@ -7,9 +7,9 @@ import java.util.HashMap; */ public class TokensTranslations { - private static HashMap translationToken; + HashMap translationToken = new HashMap(); - TokensTranslations() { + public void initailize() { translationToken.put("Kazakh", "ab"); translationToken.put("Afrikaans", "af"); translationToken.put("Arabic", "ar");