Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: changing the OS locale doesn't change the app locale #4323

Merged
merged 3 commits into from Oct 24, 2021
Merged

FIX: changing the OS locale doesn't change the app locale #4323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d6b551
When the serving size value is incorrect (eg: "serving" with barcode …
g123k Oct 24, 2021
7ab0547
FIX: changing the OS locale doesn't change the app locale
g123k Oct 24, 2021
1d3a9ce
[CodeFactor] Apply fixes
code-factor Oct 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions ...hub/scrachx/openfood/features/product/edit/nutrition/ProductEditNutritionFactsFragment.kt
View file
Open in desktop
Expand Up @@ -310,13 +310,16 @@ class ProductEditNutritionFactsFragment : ProductEditFragment() {
getModifierIndex(nutriments[nutriment]?.modifier)

private fun updateServingSize(servingSize: String) {
try {
val (value, unit) = parseServing(servingSize)

val (value, unit) = parseServing(servingSize)

binding.servingSize.setText(value)
binding.servingSize.setText(value)

if (unit != null) {
binding.servingSize.unitSpinner?.setSelection(getServingUnitIndex(unit))
if (unit != null) {
binding.servingSize.unitSpinner?.setSelection(getServingUnitIndex(unit))
}
} catch (exception : IllegalArgumentException) {
binding.servingSize.setText("")
}
}

Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/LocaleManager.kt
View file
Open in desktop
Expand Up @@ -40,12 +40,14 @@ class LocaleManager @Inject constructor(
private var currentLocale: Locale

init {
currentLocale = getLanguageFromPrefs()?.let {
LocaleUtils.parseLocale(it)
} ?: Locale.getDefault()
currentLocale = reloadLocale()
}

fun restoreLocalizedContext(context: Context) = changeAppLanguage(context, currentLocale)
fun restoreLocalizedContext(context: Context): Context = changeAppLanguage(context, reloadLocale())

private fun reloadLocale() = getLanguageFromPrefs()?.let {
LocaleUtils.parseLocale(it)
} ?: Locale.getDefault()

/**
* Get the language of the app [Locale] (Selected in settings).
Expand Down