whitespace characters are again automatically added to the 0-key char list
This commit is contained in:
parent
0164e951cd
commit
f195daad95
16 changed files with 23 additions and 2 deletions
|
|
@ -7,6 +7,7 @@ import io.github.sspanak.tt9.languages.Language;
|
||||||
import io.github.sspanak.tt9.preferences.items.ItemClickable;
|
import io.github.sspanak.tt9.preferences.items.ItemClickable;
|
||||||
import io.github.sspanak.tt9.preferences.settings.SettingsStore;
|
import io.github.sspanak.tt9.preferences.settings.SettingsStore;
|
||||||
import io.github.sspanak.tt9.util.ConsumerCompat;
|
import io.github.sspanak.tt9.util.ConsumerCompat;
|
||||||
|
import io.github.sspanak.tt9.util.chars.Characters;
|
||||||
|
|
||||||
class ItemRestoreDefaultPunctuation extends ItemClickable {
|
class ItemRestoreDefaultPunctuation extends ItemClickable {
|
||||||
public static final String NAME = "punctuation_order_reset_defaults";
|
public static final String NAME = "punctuation_order_reset_defaults";
|
||||||
|
|
@ -42,6 +43,12 @@ class ItemRestoreDefaultPunctuation extends ItemClickable {
|
||||||
String.join("", language.getKeyCharacters(1))
|
String.join("", language.getKeyCharacters(1))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
settings.saveCharsExtra(
|
||||||
|
language,
|
||||||
|
SettingsStore.CHARS_GROUP_0,
|
||||||
|
String.join("", Characters.getCurrencies(language))
|
||||||
|
);
|
||||||
|
|
||||||
if (onClick != null) {
|
if (onClick != null) {
|
||||||
onClick.accept(String.valueOf(language.getId()));
|
onClick.accept(String.valueOf(language.getId()));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ public class PreferenceChars0 extends AbstractPreferenceCharList {
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
protected char[] getMandatoryChars() {
|
protected char[] getMandatoryChars() {
|
||||||
return new char[0];
|
return SettingsStore.FORBIDDEN_CHARS_0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,7 @@
|
||||||
<string name="pref_category_punctuation_order">Ред на пунктуацията</string>
|
<string name="pref_category_punctuation_order">Ред на пунктуацията</string>
|
||||||
<string name="language_popup_title">Изберете език</string>
|
<string name="language_popup_title">Изберете език</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">Списъкът не може да бъде празен.</string>
|
<string name="punctuation_order_cannot_be_empty">Списъкът не може да бъде празен.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Интервал и нов ред ще бъдат автоматично добавени в началото на списъка.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Липсва задължителен символ:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Липсва задължителен символ:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Липсват задължителни символи:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Липсват задължителни символи:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Неуспешно запазване на реда на знаците.</string>
|
<string name="punctuation_order_save_error">Неуспешно запазване на реда на знаците.</string>
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,7 @@
|
||||||
<string name="pref_category_punctuation_order">Interpunktionsreihenfolge</string>
|
<string name="pref_category_punctuation_order">Interpunktionsreihenfolge</string>
|
||||||
<string name="language_popup_title">Sprache auswählen</string>
|
<string name="language_popup_title">Sprache auswählen</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">Die Liste darf nicht leer sein.</string>
|
<string name="punctuation_order_cannot_be_empty">Die Liste darf nicht leer sein.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Leer- und Zeilenumbruchzeichen werden automatisch am Anfang der Liste hinzugefügt.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Fehlendes erforderliches Zeichen:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Fehlendes erforderliches Zeichen:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Fehlende erforderliche Zeichen:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Fehlende erforderliche Zeichen:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Zeichenreihenfolge konnte nicht gespeichert werden.</string>
|
<string name="punctuation_order_save_error">Zeichenreihenfolge konnte nicht gespeichert werden.</string>
|
||||||
|
|
|
||||||
|
|
@ -196,6 +196,7 @@
|
||||||
<string name="pref_category_punctuation_order">Orden de puntuación</string>
|
<string name="pref_category_punctuation_order">Orden de puntuación</string>
|
||||||
<string name="language_popup_title">Seleccionar idioma</string>
|
<string name="language_popup_title">Seleccionar idioma</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">La lista no puede estar vacía.</string>
|
<string name="punctuation_order_cannot_be_empty">La lista no puede estar vacía.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Los caracteres Espacio y Nueva línea se añadirán automáticamente al principio de la lista.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Falta carácter obligatorio:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Falta carácter obligatorio:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Faltan caracteres obligatorios:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Faltan caracteres obligatorios:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Error al guardar el orden de los caracteres.</string>
|
<string name="punctuation_order_save_error">Error al guardar el orden de los caracteres.</string>
|
||||||
|
|
|
||||||
|
|
@ -194,6 +194,7 @@
|
||||||
<string name="pref_category_punctuation_order">Ordre de ponctuation</string>
|
<string name="pref_category_punctuation_order">Ordre de ponctuation</string>
|
||||||
<string name="language_popup_title">Sélectionner la langue</string>
|
<string name="language_popup_title">Sélectionner la langue</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">La liste ne peut pas être vide.</string>
|
<string name="punctuation_order_cannot_be_empty">La liste ne peut pas être vide.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Les caractères Espace et Retour à la ligne seront automatiquement ajoutés au début de la liste.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Caractère obligatoire manquant :%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Caractère obligatoire manquant :%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Caractères obligatoires manquants :%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Caractères obligatoires manquants :%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Échec de l’enregistrement de l’ordre des caractères.</string>
|
<string name="punctuation_order_save_error">Échec de l’enregistrement de l’ordre des caractères.</string>
|
||||||
|
|
|
||||||
|
|
@ -183,6 +183,7 @@
|
||||||
<string name="pref_category_punctuation_order">Ordine di punteggiatura</string>
|
<string name="pref_category_punctuation_order">Ordine di punteggiatura</string>
|
||||||
<string name="language_popup_title">Seleziona la lingua</string>
|
<string name="language_popup_title">Seleziona la lingua</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">L\'elenco non può essere vuoto.</string>
|
<string name="punctuation_order_cannot_be_empty">L\'elenco non può essere vuoto.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">I caratteri Spazio e Nuova linea verranno automaticamente aggiunti all\'inizio dell\'elenco.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Carattere obbligatorio mancante:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Carattere obbligatorio mancante:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Caratteri obbligatori mancanti:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Caratteri obbligatori mancanti:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Salvataggio dell’ordine dei caratteri non riuscito.</string>
|
<string name="punctuation_order_save_error">Salvataggio dell’ordine dei caratteri non riuscito.</string>
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,7 @@
|
||||||
<string name="pref_category_punctuation_order">סדר סימני פיסוק</string>
|
<string name="pref_category_punctuation_order">סדר סימני פיסוק</string>
|
||||||
<string name="language_popup_title">בחר שפה</string>
|
<string name="language_popup_title">בחר שפה</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">הרשימה לא יכולה להיות ריקה.</string>
|
<string name="punctuation_order_cannot_be_empty">הרשימה לא יכולה להיות ריקה.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">תווי רווח ושורה חדשה יתווספו אוטומטית בתחילת הרשימה.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">תו חובה חסר: %1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">תו חובה חסר: %1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">תווי חובה חסרים:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">תווי חובה חסרים:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">שמירת סדר התווים נכשלה.</string>
|
<string name="punctuation_order_save_error">שמירת סדר התווים נכשלה.</string>
|
||||||
|
|
|
||||||
|
|
@ -205,6 +205,7 @@
|
||||||
<string name="pref_category_punctuation_order">Skyrybos ženklų tvarka</string>
|
<string name="pref_category_punctuation_order">Skyrybos ženklų tvarka</string>
|
||||||
<string name="language_popup_title">Pasirinkite kalbą</string>
|
<string name="language_popup_title">Pasirinkite kalbą</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">Sąrašas negali būti tuščias.</string>
|
<string name="punctuation_order_cannot_be_empty">Sąrašas negali būti tuščias.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Tarpas ir naujos eilutės simboliai bus automatiškai pridėti sąrašo pradžioje.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Trūksta privalomo simbolio:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Trūksta privalomo simbolio:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Trūksta privalomų simbolių:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Trūksta privalomų simbolių:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Nepavyko išsaugoti simbolių tvarkos.</string>
|
<string name="punctuation_order_save_error">Nepavyko išsaugoti simbolių tvarkos.</string>
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,7 @@
|
||||||
<string name="pref_category_punctuation_order">Interpunctievolgorde</string>
|
<string name="pref_category_punctuation_order">Interpunctievolgorde</string>
|
||||||
<string name="language_popup_title">Selecteer taal</string>
|
<string name="language_popup_title">Selecteer taal</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">De lijst mag niet leeg zijn.</string>
|
<string name="punctuation_order_cannot_be_empty">De lijst mag niet leeg zijn.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Spatie- en nieuwe regeltekens worden automatisch aan het begin van de lijst toegevoegd.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Ontbrekend verplicht teken:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Ontbrekend verplicht teken:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Ontbrekende verplichte tekens:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Ontbrekende verplichte tekens:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Opslaan van de tekenvolgorde mislukt.</string>
|
<string name="punctuation_order_save_error">Opslaan van de tekenvolgorde mislukt.</string>
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,7 @@
|
||||||
<string name="pref_category_punctuation_order">Ordem de pontuação</string>
|
<string name="pref_category_punctuation_order">Ordem de pontuação</string>
|
||||||
<string name="language_popup_title">Selecione o idioma</string>
|
<string name="language_popup_title">Selecione o idioma</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">A lista não pode estar vazia.</string>
|
<string name="punctuation_order_cannot_be_empty">A lista não pode estar vazia.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Os caracteres de Espaço e Nova linha serão automaticamente adicionados no início da lista.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Caractere obrigatório ausente:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Caractere obrigatório ausente:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Caracteres obrigatórios ausentes:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Caracteres obrigatórios ausentes:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Falha ao salvar a ordem dos caracteres.</string>
|
<string name="punctuation_order_save_error">Falha ao salvar a ordem dos caracteres.</string>
|
||||||
|
|
|
||||||
|
|
@ -196,6 +196,7 @@
|
||||||
<string name="pref_category_punctuation_order">Порядок пунктуации</string>
|
<string name="pref_category_punctuation_order">Порядок пунктуации</string>
|
||||||
<string name="language_popup_title">Выберите язык</string>
|
<string name="language_popup_title">Выберите язык</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">Список не может быть пустым.</string>
|
<string name="punctuation_order_cannot_be_empty">Список не может быть пустым.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Пробел и символ новой строки будут автоматически добавлены в начало списка.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Отсутствует обязательный символ:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Отсутствует обязательный символ:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Отсутствуют обязательные символы:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Отсутствуют обязательные символы:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">е удалось сохранить порядок символов.</string>
|
<string name="punctuation_order_save_error">е удалось сохранить порядок символов.</string>
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,7 @@
|
||||||
<string name="pref_category_punctuation_order">Noktalama sırası</string>
|
<string name="pref_category_punctuation_order">Noktalama sırası</string>
|
||||||
<string name="language_popup_title">Dil Seçin</string>
|
<string name="language_popup_title">Dil Seçin</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">Liste boş olamaz.</string>
|
<string name="punctuation_order_cannot_be_empty">Liste boş olamaz.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Boşluk ve Yeni Satır karakterleri listenin başına otomatik olarak eklenecektir.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Zorunlu karakter eksik:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Zorunlu karakter eksik:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Zorunlu karakterler eksik:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Zorunlu karakterler eksik:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Karakter sırası kaydedilemedi.</string>
|
<string name="punctuation_order_save_error">Karakter sırası kaydedilemedi.</string>
|
||||||
|
|
|
||||||
|
|
@ -207,6 +207,7 @@
|
||||||
<string name="pref_category_punctuation_order">Порядок пунктуації</string>
|
<string name="pref_category_punctuation_order">Порядок пунктуації</string>
|
||||||
<string name="language_popup_title">Виберіть мову</string>
|
<string name="language_popup_title">Виберіть мову</string>
|
||||||
<string name="punctuation_order_cannot_be_empty">Список не може бути порожнім.</string>
|
<string name="punctuation_order_cannot_be_empty">Список не може бути порожнім.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Пробіл і символ нового рядка буде автоматично додано на початок списку.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Відсутній обов’язковий символ:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Відсутній обов’язковий символ:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Відсутні обов’язкові символи:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Відсутні обов’язкові символи:%1$s</string>
|
||||||
<string name="punctuation_order_save_error">Не вдалося зберегти порядок символів.</string>
|
<string name="punctuation_order_save_error">Не вдалося зберегти порядок символів.</string>
|
||||||
|
|
|
||||||
|
|
@ -205,6 +205,7 @@
|
||||||
<string name="language_popup_title">Select Language</string>
|
<string name="language_popup_title">Select Language</string>
|
||||||
|
|
||||||
<string name="punctuation_order_cannot_be_empty">The list can not be empty.</string>
|
<string name="punctuation_order_cannot_be_empty">The list can not be empty.</string>
|
||||||
|
<string name="punctuation_order_whitespace_will_be_added_automatically">Space and Newline characters will be automatically added at the beginning of the list.</string>
|
||||||
<string name="punctuation_order_mandatory_char_missing">Missing mandatory character:%1$s</string>
|
<string name="punctuation_order_mandatory_char_missing">Missing mandatory character:%1$s</string>
|
||||||
<string name="punctuation_order_mandatory_chars_missing">Missing mandatory characters:%1$s</string>
|
<string name="punctuation_order_mandatory_chars_missing">Missing mandatory characters:%1$s</string>
|
||||||
<string name="punctuation_order_forbidden_char">Forbidden character:%1$s</string>
|
<string name="punctuation_order_forbidden_char">Forbidden character:%1$s</string>
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,8 @@
|
||||||
android:title="@string/punctuation_order_key_0">
|
android:title="@string/punctuation_order_key_0">
|
||||||
<io.github.sspanak.tt9.preferences.screens.punctuation.PreferenceChars0
|
<io.github.sspanak.tt9.preferences.screens.punctuation.PreferenceChars0
|
||||||
android:key="punctuation_order_special_chars"
|
android:key="punctuation_order_special_chars"
|
||||||
android:title="@string/punctuation_order_initial"/>
|
android:title="@string/punctuation_order_initial"
|
||||||
|
android:summary="@string/punctuation_order_whitespace_will_be_added_automatically" />
|
||||||
|
|
||||||
<io.github.sspanak.tt9.preferences.screens.punctuation.PreferenceCharsExtra
|
<io.github.sspanak.tt9.preferences.screens.punctuation.PreferenceCharsExtra
|
||||||
android:key="punctuation_order_key_0_group"
|
android:key="punctuation_order_key_0_group"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue