From f9e4f870a98e7eea9d47f0378f66f6853009fbd5 Mon Sep 17 00:00:00 2001 From: alvaro_rc <109553591+alvarocampioni@users.noreply.github.com> Date: Sun, 18 Jan 2026 22:42:06 -0300 Subject: [PATCH 1/3] adds default currency feature --- .../card_locker/LoyaltyCardEditActivity.java | 6 ++- .../card_locker/preferences/Settings.java | 11 ++++++ .../preferences/SettingsActivity.kt | 37 ++++++++++++++++++- app/src/main/res/values/strings.xml | 2 + app/src/main/res/xml/preferences.xml | 8 ++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 83fc94972c..a3b6642ea6 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -60,6 +60,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.tabs.TabLayout; +import com.jaredrummler.android.colorpicker.BuildConfig; import com.jaredrummler.android.colorpicker.ColorPickerDialog; import com.jaredrummler.android.colorpicker.ColorPickerDialogListener; import com.yalantis.ucrop.UCrop; @@ -91,6 +92,7 @@ import protect.card_locker.async.TaskHandler; import protect.card_locker.databinding.LayoutChipChoiceBinding; import protect.card_locker.databinding.LoyaltyCardEditActivityBinding; +import protect.card_locker.preferences.Settings; import protect.card_locker.viewmodels.LoyaltyCardEditActivityViewModel; public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback, ColorPickerDialogListener { @@ -1014,7 +1016,9 @@ protected static void formatDateField(Context context, EditText textField, Date private void formatBalanceCurrencyField(Currency balanceType) { if (balanceType == null) { - balanceCurrencyField.setText(getString(R.string.points)); + Currency defaultCurrency = new Settings(getApplicationContext()).getCurrency(); + String symbol = defaultCurrency == null ? getString(R.string.points) : defaultCurrency.getSymbol(); + balanceCurrencyField.setText(symbol); } else { balanceCurrencyField.setText(getCurrencySymbol(balanceType)); } diff --git a/app/src/main/java/protect/card_locker/preferences/Settings.java b/app/src/main/java/protect/card_locker/preferences/Settings.java index 9c546f734c..003b41ad66 100644 --- a/app/src/main/java/protect/card_locker/preferences/Settings.java +++ b/app/src/main/java/protect/card_locker/preferences/Settings.java @@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatDelegate; import androidx.preference.PreferenceManager; +import java.util.Currency; import java.util.Locale; import protect.card_locker.R; @@ -58,6 +59,16 @@ public Locale getLocale() { return Utils.stringToLocale(value); } + public Currency getCurrency() { + String value = getString(R.string.settings_key_default_currency, "Points"); + + if(value.equals("Points")){ + return null; + } + + return Currency.getInstance(value); + } + public int getTheme() { String value = getString(R.string.settings_key_theme, getResString(R.string.settings_key_system_theme)); diff --git a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt index 06b7377ecb..006cee5e52 100644 --- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt +++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt @@ -1,6 +1,5 @@ package protect.card_locker.preferences -import android.app.Activity import android.content.Intent import android.os.Build import android.os.Bundle @@ -17,6 +16,15 @@ import protect.card_locker.MainActivity import protect.card_locker.R import protect.card_locker.Utils import protect.card_locker.databinding.SettingsActivityBinding +import java.util.Collections +import java.util.Currency +import kotlin.Any +import kotlin.Boolean +import kotlin.CharSequence +import kotlin.Comparator +import kotlin.String +import kotlin.toString + class SettingsActivity : CatimaAppCompatActivity() { @@ -102,6 +110,33 @@ class SettingsActivity : CatimaAppCompatActivity() { true } + // setting up currency preferences options + val currencyPreference = findPreference(getString(R.string.settings_key_default_currency))!! + val symbols = mutableListOf() + + Currency.getAvailableCurrencies().forEach { currency -> + symbols.add(currency.symbol) + } + + // sort maintaining symbols and points on top + val sortedSymbols = symbols.sortedWith { a, b -> + val aIsSymbol = a.matches("^[^a-zA-Z]*$".toRegex()) + val bIsSymbol = b.matches("^[^a-zA-Z]*$".toRegex()) + + when { + !aIsSymbol && bIsSymbol -> 1 + aIsSymbol && !bIsSymbol -> -1 + else -> a.compareTo(b) + } + }.toMutableList() + + sortedSymbols.add(0, "Points") + val arr = sortedSymbols.map { it as CharSequence }.toTypedArray() + + // set the currencies options + currencyPreference.entryValues = arr + currencyPreference.entries = arr + val oledDarkPreference = findPreference(getString(R.string.settings_key_oled_dark)) oledDarkPreference!!.setOnPreferenceChangeListener { _, _ -> refreshActivity(true) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6f8d93c5a..283542af4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -345,4 +345,6 @@ No value found Barcode encoding Back + Default Currency + pref_currency diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index edcb29fe90..c8cb10016e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -35,6 +35,14 @@ app:singleLineTitle="false" app:useSimpleSummaryProvider="true" /> + + Date: Mon, 19 Jan 2026 12:36:23 -0300 Subject: [PATCH 2/3] refactored changes - Correctly assigned symbols to currency codes for respectively entries and entrieValues - Removed hardcoded string "Points" - Only select default currency at the creation of a new card (when its required field is empty) --- .../card_locker/LoyaltyCardEditActivity.java | 7 ++-- .../card_locker/preferences/Settings.java | 5 +-- .../preferences/SettingsActivity.kt | 36 +++++++++++-------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index a3b6642ea6..cb604340a9 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -1017,8 +1017,11 @@ protected static void formatDateField(Context context, EditText textField, Date private void formatBalanceCurrencyField(Currency balanceType) { if (balanceType == null) { Currency defaultCurrency = new Settings(getApplicationContext()).getCurrency(); - String symbol = defaultCurrency == null ? getString(R.string.points) : defaultCurrency.getSymbol(); - balanceCurrencyField.setText(symbol); + if(defaultCurrency != null && storeFieldEdit.getText().toString().isEmpty()){ + balanceCurrencyField.setText(getCurrencySymbol(defaultCurrency)); + } else { + balanceCurrencyField.setText(getString(R.string.points)); + } } else { balanceCurrencyField.setText(getCurrencySymbol(balanceType)); } diff --git a/app/src/main/java/protect/card_locker/preferences/Settings.java b/app/src/main/java/protect/card_locker/preferences/Settings.java index 003b41ad66..525cddb571 100644 --- a/app/src/main/java/protect/card_locker/preferences/Settings.java +++ b/app/src/main/java/protect/card_locker/preferences/Settings.java @@ -60,9 +60,10 @@ public Locale getLocale() { } public Currency getCurrency() { - String value = getString(R.string.settings_key_default_currency, "Points"); + String points = getResString(R.string.points); + String value = getString(R.string.settings_key_default_currency, points); - if(value.equals("Points")){ + if(value.equals(points)){ return null; } diff --git a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt index 006cee5e52..3887d5ad35 100644 --- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt +++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt @@ -112,30 +112,36 @@ class SettingsActivity : CatimaAppCompatActivity() { // setting up currency preferences options val currencyPreference = findPreference(getString(R.string.settings_key_default_currency))!! + + val currencies = Currency.getAvailableCurrencies().stream().sorted { a, b -> + val aIsSymbol = a.symbol.matches("^[^a-zA-Z]*$".toRegex()) + val bIsSymbol = b.symbol.matches("^[^a-zA-Z]*$".toRegex()) + when { + !aIsSymbol && bIsSymbol -> 1 + aIsSymbol && !bIsSymbol -> -1 + else -> a.symbol.compareTo(b.symbol) + } + }.toList() + val symbols = mutableListOf() + val codes = mutableListOf() - Currency.getAvailableCurrencies().forEach { currency -> + for(currency in currencies){ symbols.add(currency.symbol) + codes.add(currency.currencyCode) } - // sort maintaining symbols and points on top - val sortedSymbols = symbols.sortedWith { a, b -> - val aIsSymbol = a.matches("^[^a-zA-Z]*$".toRegex()) - val bIsSymbol = b.matches("^[^a-zA-Z]*$".toRegex()) + val points = getString(R.string.points) - when { - !aIsSymbol && bIsSymbol -> 1 - aIsSymbol && !bIsSymbol -> -1 - else -> a.compareTo(b) - } - }.toMutableList() + symbols.add(0, points) + codes.add(0, points) - sortedSymbols.add(0, "Points") - val arr = sortedSymbols.map { it as CharSequence }.toTypedArray() + val entries = symbols.map { it as CharSequence }.toTypedArray() + val entryValues = codes.map { it as CharSequence }.toTypedArray() // set the currencies options - currencyPreference.entryValues = arr - currencyPreference.entries = arr + currencyPreference.entryValues = entryValues + currencyPreference.entries = entries val oledDarkPreference = findPreference(getString(R.string.settings_key_oled_dark)) oledDarkPreference!!.setOnPreferenceChangeListener { _, _ -> From 4fa61a098db42f5b78852cd7dbd007c22b6f1ada Mon Sep 17 00:00:00 2001 From: alvaro_rc <109553591+alvarocampioni@users.noreply.github.com> Date: Mon, 19 Jan 2026 12:53:05 -0300 Subject: [PATCH 3/3] translations --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-be/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el-rGR/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-et/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-in-rID/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sl/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 28 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 4f713afbe9..7b5b66f9d5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -325,4 +325,5 @@ رجوع إخطار بإرسال تقارير الأخطاء عند التفعيل, سيتم سؤالك للابلاغ بالاعطال عندما تحدث. لا ولن يتم الابلاغ بالاعطال تلفائيا. + العملة الافتراضية diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 5c8f3f9d81..f2792860be 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -308,4 +308,5 @@ Пасля таго, як вы дадасце некалькі картак лаяльнасці ў Catima, яны з\'явяцца тут. Калі ў вас ёсць карты, пераканайцеся, што яны не ўсе заархіваваны. Прабачце, але ў праграме %s адбыўся збой. Калі ласка, дапамажыце нам выправіць гэту праблему, даслаўшы нам справаздачу аб памылцы. Назад + Валюта па змаўчанні diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 66f76b4406..a471dd5da0 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -301,4 +301,5 @@ Няма стойност Назад Кодиране на щрихкода + Валута по подразбиране diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 51c62ef932..b186c8ea06 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -307,4 +307,5 @@ Nenalezena žádná hodnota Kódování čárového kódu Zpět + Výchozí měna diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e9f34bfc92..fcd2a90279 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -301,4 +301,5 @@ Keinen Betrag gefunden Barcode-Kodierung Zurück + Standardwährung diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index af10818252..22d5e025af 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -301,4 +301,5 @@ Δεν βρέθηκε τιμή Κωδικοποίηση γραμμωτού κώδικα Πίσω + Προεπιλεγμένο νόμισμα diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index cd3f36a29b..a44c7514c8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -307,4 +307,5 @@ Ningún valor encontrado Codificación de barra de código Atrás + Moneda Predeterminada diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index eda361bbca..e732d42c6e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -301,4 +301,5 @@ Ühtegi väärtust ei leidu Triipkoodi kodeerimine Tagasi + Vaikevaluuta diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c65761ce9a..00ab4f30ec 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -292,4 +292,5 @@ Aseta viivakoodin leveys Korttiluettelo Kun olet lisännyt kanta-asiakaskortteja Catimaan, ne näkyvät täällä. Jos sinulla on kortteja, varmista, etteivät ne kaikki ole arkistoituja. + Oletusvaluutta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fdb3459fb2..d595bf2a74 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -307,4 +307,5 @@ Aucune valeur trouvée Encodage du code-barres Retour + Devise par défaut diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index a9bb2d9e46..99287ac961 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -300,4 +300,5 @@ Non hai ningún valor Códificación do código de barras Volver + Moeda Predeterminada diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index d0aade1217..f31ef8950f 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -302,4 +302,5 @@ Izvještaj o prekidu rada aplikacije %s Pitaj da li poslati izvještaj o prekidu rada aplikacije Kada je uključeno, zamolit ćemo te da prijaviš prekid rada aplikacije kada se dogodi. Izvještaji o prekidu rada se nikada ne šalju automatski. + Zadana valuta diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 1651b7c4cb..bf7c2156a3 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -292,4 +292,5 @@ Ketika diaktifkan, Anda akan diminta untuk melaporkan crash saat terjadi. Laporan crash tidak pernah dikirim secara otomatis. Salin nilai Disalin ke papan klip + Mata Uang Default diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ea593b113e..5d78120d1b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -305,4 +305,5 @@ Copia valore Copiato negli appunti Nessun valore trovato + Valuta Predefinita diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b22ea71bd8..c280dfc2de 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -294,4 +294,5 @@ 値が見つかりません バーコードの符号化 戻る + デフォルトの通貨 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 519ac7e82f..2a672f2f54 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -299,4 +299,5 @@ Geen waarde gevonden Gekopieerd naar klembord Kopieer waarde + Standaardvaluta diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cf1c5f1c07..0c963e2974 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -311,4 +311,5 @@ Kopiuj wartość Skopiowano do schowka Nie znaleziono wartości + Domyślna waluta diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9119ba33dc..343d6a66ae 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -305,4 +305,5 @@ Copiar valor Copiado para a área de transferência Nenhum valor encontrado + Moeda Padrão diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 7a0518bb57..b40c549f28 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -305,4 +305,5 @@ Copiar valor Copiado para a área de transferência Nenhum valor encontrado + Moeda Padrão diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6ed8e51bfb..4168d591ef 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -304,4 +304,5 @@ Copiar valor Copiado para a área de transferência Nenhum valor encontrado + Moeda Padrão diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1f3f804702..f881b3c0d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -313,4 +313,5 @@ Значение не найдено Кодировка штрих-кода Назад + Валюта по умолчанию diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 5ed16e8118..76bb09246b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -305,4 +305,5 @@ Kopírovať hodnotu Skopírované do schránky Nenašla sa žiadna hodnota + Predvolená Mena diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 228725d48c..3f533f4370 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -312,4 +312,5 @@ Nobena vrednost ni najdena Kodiranje črtne kode Nazaj + Privzeta Valuta diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index bafd6d9fe8..d64183ccac 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -299,4 +299,5 @@ Değeri kopyala Panoya kopyalandı Değer bulunamadı + Varsayılan Para Birimi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d9ccfc4b87..1f8f8ce8bb 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -313,4 +313,5 @@ Значення не знайдено Кодування штрих-кодів Назад + Валюта за умовчанням diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 67659772e5..9246a8975c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -295,4 +295,5 @@ 没找到值 条形码编码 返回 + 預設貨幣 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 245f1ec0c4..fa7adc372a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -294,4 +294,5 @@ 未找到值 條碼編碼 返回 + 預設貨幣 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 283542af4e..186b294a10 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -346,5 +346,5 @@ Barcode encoding Back Default Currency - pref_currency + pref_currency