Skip to content

Commit 6c1ea53

Browse files
author
Paolo Rotolo
committed
Fix issue when locale is not english.
1 parent 9904ca3 commit 6c1ea53

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
applicationIdSuffix '.daily'
5151

5252
buildConfigField 'String', 'GOOGLE_ANALYTICS_TRACKER', '"UA-68882401-2"'
53-
buildConfigField "String[]", "TRANSLATION_ARRAY", "new String[]{}"
53+
buildConfigField "String[]", "TRANSLATION_ARRAY", getAllLocales()
5454
}
5555

5656
release {

app/src/main/java/org/glucosio/android/activity/PreferencesActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import android.util.Log;
4242
import android.view.MenuItem;
4343
import android.widget.EditText;
44-
import android.widget.Toast;
4544

4645
import org.glucosio.android.BuildConfig;
4746
import org.glucosio.android.GlucosioApplication;
@@ -53,7 +52,6 @@
5352
import org.glucosio.android.tools.LocaleHelper;
5453

5554
import java.util.ArrayList;
56-
import java.util.Arrays;
5755
import java.util.Collections;
5856
import java.util.HashSet;
5957
import java.util.List;
@@ -336,8 +334,10 @@ private void initLanguagePreference() {
336334
// We always support english
337335
availableLanguagesSet.add("en");
338336

339-
// Get example string from english locale
340-
String englishString = getResources().getString(R.string.title_activity_add_glucose);
337+
// Get english string to confront
338+
// I know, it's a weird workaround
339+
// Sorry :/
340+
String englishString = "Automatic backup";
341341

342342
for (String localString : languages) {
343343
// For each locale, check if we have translations
@@ -348,7 +348,7 @@ private void initLanguagePreference() {
348348
res.updateConfiguration(conf, null);
349349

350350
// Retrieve an example string from this locale
351-
String localizedString = res.getString(R.string.title_activity_add_glucose);
351+
String localizedString = res.getString(R.string.activity_backup_drive_automatic);
352352

353353
if (!englishString.equals(localizedString)){
354354
// if english string is not the same of localized one

0 commit comments

Comments
 (0)