From 2ebe7d336549f0f83776a91ee407f217f860078d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 14 Nov 2023 10:53:30 +0100 Subject: [PATCH] Localazy: move `emoji_picker_category_` strings to the `:features:messages:impl` module. --- .../customreaction/EmojibaseExtensions.kt | 44 +++++++++---------- .../src/main/res/values-cs/translations.xml | 8 ++++ .../src/main/res/values-de/translations.xml | 8 ++++ .../src/main/res/values-es/translations.xml | 8 ++++ .../src/main/res/values-fr/translations.xml | 8 ++++ .../src/main/res/values-it/translations.xml | 8 ++++ .../src/main/res/values-ro/translations.xml | 8 ++++ .../src/main/res/values-ru/translations.xml | 8 ++++ .../src/main/res/values-sk/translations.xml | 8 ++++ .../main/res/values-zh-rTW/translations.xml | 8 ++++ .../impl/src/main/res/values/localazy.xml | 8 ++++ .../src/main/res/values-cs/translations.xml | 8 ---- .../src/main/res/values-de/translations.xml | 8 ---- .../src/main/res/values-es/translations.xml | 8 ---- .../src/main/res/values-fr/translations.xml | 8 ---- .../src/main/res/values-it/translations.xml | 8 ---- .../src/main/res/values-ro/translations.xml | 8 ---- .../src/main/res/values-ru/translations.xml | 8 ---- .../src/main/res/values-sk/translations.xml | 8 ---- .../main/res/values-zh-rTW/translations.xml | 8 ---- .../src/main/res/values/localazy.xml | 8 ---- tools/localazy/config.json | 3 +- 22 files changed, 103 insertions(+), 104 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt index fb111cce97..bf1c69e612 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt @@ -28,31 +28,29 @@ import androidx.compose.material.icons.outlined.EmojiSymbols import androidx.compose.material.icons.outlined.EmojiTransportation import androidx.compose.ui.graphics.vector.ImageVector import io.element.android.emojibasebindings.EmojibaseCategory -import io.element.android.libraries.ui.strings.CommonStrings +import io.element.android.features.messages.impl.R @get:StringRes -val EmojibaseCategory.title: Int get() = - when(this){ - EmojibaseCategory.People -> CommonStrings.emoji_picker_category_people - EmojibaseCategory.Nature -> CommonStrings.emoji_picker_category_nature - EmojibaseCategory.Foods -> CommonStrings.emoji_picker_category_foods - EmojibaseCategory.Activity -> CommonStrings.emoji_picker_category_activity - EmojibaseCategory.Places -> CommonStrings.emoji_picker_category_places - EmojibaseCategory.Objects -> CommonStrings.emoji_picker_category_objects - EmojibaseCategory.Symbols -> CommonStrings.emoji_picker_category_symbols - EmojibaseCategory.Flags -> CommonStrings.emoji_picker_category_flags +val EmojibaseCategory.title: Int + get() = when (this) { + EmojibaseCategory.People -> R.string.emoji_picker_category_people + EmojibaseCategory.Nature -> R.string.emoji_picker_category_nature + EmojibaseCategory.Foods -> R.string.emoji_picker_category_foods + EmojibaseCategory.Activity -> R.string.emoji_picker_category_activity + EmojibaseCategory.Places -> R.string.emoji_picker_category_places + EmojibaseCategory.Objects -> R.string.emoji_picker_category_objects + EmojibaseCategory.Symbols -> R.string.emoji_picker_category_symbols + EmojibaseCategory.Flags -> R.string.emoji_picker_category_flags } val EmojibaseCategory.icon: ImageVector - get() = - when(this){ - EmojibaseCategory.People -> Icons.Outlined.EmojiPeople - EmojibaseCategory.Nature -> Icons.Outlined.EmojiNature - EmojibaseCategory.Foods -> Icons.Outlined.EmojiFoodBeverage - EmojibaseCategory.Activity -> Icons.Outlined.EmojiEvents - EmojibaseCategory.Places -> Icons.Outlined.EmojiTransportation - EmojibaseCategory.Objects -> Icons.Outlined.EmojiObjects - EmojibaseCategory.Symbols -> Icons.Outlined.EmojiSymbols - EmojibaseCategory.Flags -> Icons.Outlined.EmojiFlags - } - + get() = when (this) { + EmojibaseCategory.People -> Icons.Outlined.EmojiPeople + EmojibaseCategory.Nature -> Icons.Outlined.EmojiNature + EmojibaseCategory.Foods -> Icons.Outlined.EmojiFoodBeverage + EmojibaseCategory.Activity -> Icons.Outlined.EmojiEvents + EmojibaseCategory.Places -> Icons.Outlined.EmojiTransportation + EmojibaseCategory.Objects -> Icons.Outlined.EmojiObjects + EmojibaseCategory.Symbols -> Icons.Outlined.EmojiSymbols + EmojibaseCategory.Flags -> Icons.Outlined.EmojiFlags + } diff --git a/features/messages/impl/src/main/res/values-cs/translations.xml b/features/messages/impl/src/main/res/values-cs/translations.xml index 5eeb2c2264..09c0aa4929 100644 --- a/features/messages/impl/src/main/res/values-cs/translations.xml +++ b/features/messages/impl/src/main/res/values-cs/translations.xml @@ -1,5 +1,13 @@ + "Aktivity" + "Vlajky" + "Jídlo a nápoje" + "Zvířata a příroda" + "Předměty" + "Smajlíci a lidé" + "Cestování a místa" + "Symboly" "%1$d změna místnosti" "%1$d změny místnosti" diff --git a/features/messages/impl/src/main/res/values-de/translations.xml b/features/messages/impl/src/main/res/values-de/translations.xml index 161868614c..c561551060 100644 --- a/features/messages/impl/src/main/res/values-de/translations.xml +++ b/features/messages/impl/src/main/res/values-de/translations.xml @@ -1,5 +1,13 @@ + "Aktivitäten" + "Flaggen" + "Essen & Trinken" + "Tiere & Natur" + "Objekte" + "Smileys & Menschen" + "Reisen & Orte" + "Symbole" "%1$d Raumänderung" "%1$d Raumänderungen" diff --git a/features/messages/impl/src/main/res/values-es/translations.xml b/features/messages/impl/src/main/res/values-es/translations.xml index fe186df358..f411e6152f 100644 --- a/features/messages/impl/src/main/res/values-es/translations.xml +++ b/features/messages/impl/src/main/res/values-es/translations.xml @@ -1,5 +1,13 @@ + "Actividades" + "Banderas" + "Comida y bebida" + "Animales y naturaleza" + "Objetos" + "Emojis y personas" + "Viajes y lugares" + "Símbolos" "%1$d cambio en la sala" "%1$d cambios en la sala" diff --git a/features/messages/impl/src/main/res/values-fr/translations.xml b/features/messages/impl/src/main/res/values-fr/translations.xml index f68a29ce16..13376219da 100644 --- a/features/messages/impl/src/main/res/values-fr/translations.xml +++ b/features/messages/impl/src/main/res/values-fr/translations.xml @@ -1,5 +1,13 @@ + "Activités" + "Drapeaux" + "Nourriture et boissons" + "Animaux et nature" + "Objets" + "Émoticônes et personnes" + "Voyages & lieux" + "Symboles" "%1$d changement dans le salon" "%1$d changements dans le salon" diff --git a/features/messages/impl/src/main/res/values-it/translations.xml b/features/messages/impl/src/main/res/values-it/translations.xml index 1b0a2c99a3..295be40922 100644 --- a/features/messages/impl/src/main/res/values-it/translations.xml +++ b/features/messages/impl/src/main/res/values-it/translations.xml @@ -1,5 +1,13 @@ + "Attività" + "Bandiere" + "Cibi & Bevande" + "Animali & Natura" + "Oggetti" + "Faccine & Persone" + "Viaggi & Luoghi" + "Simboli" "%1$d modifica alla stanza" "%1$d modifiche alla stanza" diff --git a/features/messages/impl/src/main/res/values-ro/translations.xml b/features/messages/impl/src/main/res/values-ro/translations.xml index 16e4867196..d096387b16 100644 --- a/features/messages/impl/src/main/res/values-ro/translations.xml +++ b/features/messages/impl/src/main/res/values-ro/translations.xml @@ -1,5 +1,13 @@ + "Activități" + "Steaguri" + "Mâncare & Băutură" + "Animale și Natură" + "Obiecte" + "Fețe zâmbitoare & Oameni" + "Călătorii & Locuri" + "Simboluri" "%1$d schimbare a camerii" "%1$d schimbări ale camerei" diff --git a/features/messages/impl/src/main/res/values-ru/translations.xml b/features/messages/impl/src/main/res/values-ru/translations.xml index c3af66d8ad..881c8c929f 100644 --- a/features/messages/impl/src/main/res/values-ru/translations.xml +++ b/features/messages/impl/src/main/res/values-ru/translations.xml @@ -1,5 +1,13 @@ + "Деятельность" + "Флаги" + "Еда и напитки" + "Животные и природа" + "Объекты" + "Смайлы и люди" + "Путешествия и места" + "Символы" "%1$d изменение в комнате" "%1$d изменения в комнате" diff --git a/features/messages/impl/src/main/res/values-sk/translations.xml b/features/messages/impl/src/main/res/values-sk/translations.xml index 8800aa7a22..b0f20c938d 100644 --- a/features/messages/impl/src/main/res/values-sk/translations.xml +++ b/features/messages/impl/src/main/res/values-sk/translations.xml @@ -1,5 +1,13 @@ + "Aktivity" + "Vlajky" + "Jedlo a nápoje" + "Zvieratá a príroda" + "Predmety" + "Smajlíky a ľudia" + "Cestovanie a miesta" + "Symboly" "%1$d zmena miestnosti" "%1$d zmeny miestnosti" diff --git a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml index d3e9c9bce9..945d815ce6 100644 --- a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml +++ b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml @@ -1,5 +1,13 @@ + "活動" + "旗幟" + "食物與飲料" + "動物與大自然" + "物品" + "表情與人物" + "旅行與景點" + "標誌" "%1$d 個聊天室變更" diff --git a/features/messages/impl/src/main/res/values/localazy.xml b/features/messages/impl/src/main/res/values/localazy.xml index 17f791e752..cbf6c3ec16 100644 --- a/features/messages/impl/src/main/res/values/localazy.xml +++ b/features/messages/impl/src/main/res/values/localazy.xml @@ -1,5 +1,13 @@ + "Activities" + "Flags" + "Food & Drink" + "Animals & Nature" + "Objects" + "Smileys & People" + "Travel & Places" + "Symbols" "%1$d room change" "%1$d room changes" diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml index 59a52044da..ee44b50929 100644 --- a/libraries/ui-strings/src/main/res/values-cs/translations.xml +++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml @@ -178,14 +178,6 @@ "Hlasování: %1$s" "Potvrzení" "Upozornění" - "Aktivity" - "Vlajky" - "Jídlo a nápoje" - "Zvířata a příroda" - "Předměty" - "Smajlíci a lidé" - "Cestování a místa" - "Symboly" "Vytvoření trvalého odkazu se nezdařilo" "%1$s nemohl načíst mapu. Zkuste to prosím později." "Načítání zpráv se nezdařilo" diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml index 2983bc0be4..9cee0be1a4 100644 --- a/libraries/ui-strings/src/main/res/values-de/translations.xml +++ b/libraries/ui-strings/src/main/res/values-de/translations.xml @@ -155,14 +155,6 @@ "Umfrage: %1$s" "Bestätigung" "Warnung" - "Aktivitäten" - "Flaggen" - "Essen & Trinken" - "Tiere & Natur" - "Objekte" - "Smileys & Menschen" - "Reisen & Orte" - "Symbole" "Fehler beim Erstellen des Permalinks" "%1$s konnte die Karte nicht laden. Bitte versuche es später erneut." "Fehler beim Laden der Nachrichten" diff --git a/libraries/ui-strings/src/main/res/values-es/translations.xml b/libraries/ui-strings/src/main/res/values-es/translations.xml index 8bc500d7fe..75948bd37f 100644 --- a/libraries/ui-strings/src/main/res/values-es/translations.xml +++ b/libraries/ui-strings/src/main/res/values-es/translations.xml @@ -94,14 +94,6 @@ "Esperando…" "Confirmar" "Atención" - "Actividades" - "Banderas" - "Comida y bebida" - "Animales y naturaleza" - "Objetos" - "Emojis y personas" - "Viajes y lugares" - "Símbolos" "No se pudo crear el enlace permanente" "Error al cargar mensajes" "Algunos mensajes no se han enviado" diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml index ed8ff54abf..44b165a44e 100644 --- a/libraries/ui-strings/src/main/res/values-fr/translations.xml +++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml @@ -176,14 +176,6 @@ "Sondage : %1$s" "Confirmation" "Attention" - "Activités" - "Drapeaux" - "Nourriture et boissons" - "Animaux et nature" - "Objets" - "Émoticônes et personnes" - "Voyages & lieux" - "Symboles" "Échec de la création du permalien" "%1$s n’a pas pu charger la carte. Veuillez réessayer ultérieurement." "Échec du chargement des messages" diff --git a/libraries/ui-strings/src/main/res/values-it/translations.xml b/libraries/ui-strings/src/main/res/values-it/translations.xml index 303ab94c50..4d80e95faf 100644 --- a/libraries/ui-strings/src/main/res/values-it/translations.xml +++ b/libraries/ui-strings/src/main/res/values-it/translations.xml @@ -94,14 +94,6 @@ "In attesa…" "Conferma" "Attenzione" - "Attività" - "Bandiere" - "Cibi & Bevande" - "Animali & Natura" - "Oggetti" - "Faccine & Persone" - "Viaggi & Luoghi" - "Simboli" "Impossibile creare il collegamento permanente" "Caricamento dei messaggi non riuscito" "Alcuni messaggi non sono stati inviati" diff --git a/libraries/ui-strings/src/main/res/values-ro/translations.xml b/libraries/ui-strings/src/main/res/values-ro/translations.xml index 00825d232a..8b0bb4f61a 100644 --- a/libraries/ui-strings/src/main/res/values-ro/translations.xml +++ b/libraries/ui-strings/src/main/res/values-ro/translations.xml @@ -137,14 +137,6 @@ "Se aşteaptă…" "Confirmare" "Avertisment" - "Activități" - "Steaguri" - "Mâncare & Băutură" - "Animale și Natură" - "Obiecte" - "Fețe zâmbitoare & Oameni" - "Călătorii & Locuri" - "Simboluri" "Crearea permalink-ului a eșuat" "%1$s nu a putut încărca harta. Vă rugăm să încercați din nou mai târziu." "Încărcarea mesajelor a eșuat" diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml index aca6c68a85..4caabe371e 100644 --- a/libraries/ui-strings/src/main/res/values-ru/translations.xml +++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml @@ -180,14 +180,6 @@ "Подтверждение устройства" "Подтверждение" "Предупреждение" - "Деятельность" - "Флаги" - "Еда и напитки" - "Животные и природа" - "Объекты" - "Смайлы и люди" - "Путешествия и места" - "Символы" "Не удалось создать постоянную ссылку" "Не удалось загрузить карту %1$s. Пожалуйста, повторите попытку позже." "Не удалось загрузить сообщения" diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml index 3f4d241808..398bdce0c4 100644 --- a/libraries/ui-strings/src/main/res/values-sk/translations.xml +++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml @@ -180,14 +180,6 @@ "Overiť zariadenie" "Potvrdenie" "Upozornenie" - "Aktivity" - "Vlajky" - "Jedlo a nápoje" - "Zvieratá a príroda" - "Predmety" - "Smajlíky a ľudia" - "Cestovanie a miesta" - "Symboly" "Nepodarilo sa vytvoriť trvalý odkaz" "%1$s nedokázal načítať mapu. Skúste to prosím neskôr." "Načítanie správ zlyhalo" diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml index f4037bd603..0fd4347298 100644 --- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml +++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml @@ -152,14 +152,6 @@ "投票：%1$s" "確認" "警告" - "活動" - "旗幟" - "食物與飲料" - "動物與大自然" - "物品" - "表情與人物" - "旅行與景點" - "標誌" "無法建立永久連結" "%1$s無法載入地圖。請稍後再試。" "無法載入訊息" diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 4f18758bfb..88524e9375 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -180,14 +180,6 @@ "Verify device" "Confirmation" "Warning" - "Activities" - "Flags" - "Food & Drink" - "Animals & Nature" - "Objects" - "Smileys & People" - "Travel & Places" - "Symbols" "Failed creating the permalink" "%1$s could not load the map. Please try again later." "Failed loading messages" diff --git a/tools/localazy/config.json b/tools/localazy/config.json index 08d5e35456..4032f55536 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -116,7 +116,8 @@ "screen_room_.*", "screen\\.room\\..*", "screen_dm_details_.*", - "room_timeline_state_changes" + "room_timeline_state_changes", + "emoji_picker_category_.*" ], "excludeRegex": [ "screen_room_details_.*",