Skip to content

Commit 0adc3b1

Browse files
bmartybmarty
committed
Localazy: move screen_notification_settings_ strings to the :features:preferences:impl module.
Need to also import `screen_notification_settings_edit_failed_updating_default_mode` to the module `:features:roomdetails:impl`.
1 parent 2ebe7d3 commit 0adc3b1

File tree

32 files changed

+245
-229
lines changed

32 files changed

+245
-229
lines changed

‎features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.compose.ui.platform.LocalContext
2323
import androidx.compose.ui.res.stringResource
2424
import androidx.compose.ui.tooling.preview.PreviewParameter
2525
import androidx.lifecycle.Lifecycle
26+
import io.element.android.features.preferences.impl.R
2627
import io.element.android.libraries.androidutils.system.startNotificationSettingsIntent
2728
import io.element.android.libraries.designsystem.atomic.molecules.DialogLikeBannerMolecule
2829
import io.element.android.libraries.designsystem.components.async.AsyncView
@@ -57,7 +58,7 @@ fun NotificationSettingsView(
5758
PreferencePage(
5859
modifier = modifier,
5960
onBackPressed = onBackPressed,
60-
title = stringResource(id = CommonStrings.screen_notification_settings_title)
61+
title = stringResource(id = R.string.screen_notification_settings_title)
6162
) {
6263

6364
when (state.matrixSettings) {
@@ -80,7 +81,7 @@ fun NotificationSettingsView(
8081
}
8182
AsyncView(
8283
async = state.changeNotificationSettingAction,
83-
errorMessage = { stringResource(CommonStrings.screen_notification_settings_edit_failed_updating_default_mode) },
84+
errorMessage = { stringResource(R.string.screen_notification_settings_edit_failed_updating_default_mode) },
8485
onErrorDismiss = { state.eventSink(NotificationSettingsEvents.ClearNotificationChangeError) },
8586
onSuccess = {},
8687
)
@@ -103,10 +104,10 @@ private fun NotificationSettingsContentView(
103104
if (systemSettings.appNotificationsEnabled && !systemSettings.systemNotificationsEnabled) {
104105
PreferenceText(
105106
iconResourceId = CommonDrawables.ic_compound_notifications_solid_off,
106-
title = stringResource(id = CommonStrings.screen_notification_settings_system_notifications_turned_off),
107+
title = stringResource(id = R.string.screen_notification_settings_system_notifications_turned_off),
107108
subtitle = stringResource(
108-
id = CommonStrings.screen_notification_settings_system_notifications_action_required,
109-
stringResource(id = CommonStrings.screen_notification_settings_system_notifications_action_required_content_link)
109+
id = R.string.screen_notification_settings_system_notifications_action_required,
110+
stringResource(id = R.string.screen_notification_settings_system_notifications_action_required_content_link)
110111
),
111112
onClick = {
112113
context.startNotificationSettingsIntent()
@@ -116,31 +117,31 @@ private fun NotificationSettingsContentView(
116117

117118
PreferenceSwitch(
118119
modifier = modifier,
119-
title = stringResource(id = CommonStrings.screen_notification_settings_enable_notifications),
120+
title = stringResource(id = R.string.screen_notification_settings_enable_notifications),
120121
isChecked = systemSettings.appNotificationsEnabled,
121122
switchAlignment = Alignment.Top,
122123
onCheckedChange = onNotificationsEnabledChanged
123124
)
124125

125126
if (systemSettings.appNotificationsEnabled) {
126-
PreferenceCategory(title = stringResource(id = CommonStrings.screen_notification_settings_notification_section_title)) {
127+
PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_notification_section_title)) {
127128
PreferenceText(
128-
title = stringResource(id = CommonStrings.screen_notification_settings_group_chats),
129+
title = stringResource(id = R.string.screen_notification_settings_group_chats),
129130
subtitle = getTitleForRoomNotificationMode(mode = matrixSettings.defaultGroupNotificationMode),
130131
onClick = onGroupChatsClicked
131132
)
132133

133134
PreferenceText(
134-
title = stringResource(id = CommonStrings.screen_notification_settings_direct_chats),
135+
title = stringResource(id = R.string.screen_notification_settings_direct_chats),
135136
subtitle = getTitleForRoomNotificationMode(mode = matrixSettings.defaultOneToOneNotificationMode),
136137
onClick = onDirectChatsClicked
137138
)
138139
}
139140

140-
PreferenceCategory(title = stringResource(id = CommonStrings.screen_notification_settings_mode_mentions)) {
141+
PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_mode_mentions)) {
141142
PreferenceSwitch(
142143
modifier = Modifier,
143-
title = stringResource(id = CommonStrings.screen_notification_settings_room_mention_label),
144+
title = stringResource(id = R.string.screen_notification_settings_room_mention_label),
144145
isChecked = matrixSettings.atRoomNotificationsEnabled,
145146
switchAlignment = Alignment.Top,
146147
onCheckedChange = onMentionNotificationsChanged
@@ -162,8 +163,8 @@ private fun NotificationSettingsContentView(
162163
@Composable
163164
private fun getTitleForRoomNotificationMode(mode: RoomNotificationMode?) =
164165
when (mode) {
165-
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = CommonStrings.screen_notification_settings_edit_mode_all_messages)
166-
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> stringResource(id = CommonStrings.screen_notification_settings_edit_mode_mentions_and_keywords)
166+
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
167+
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
167168
RoomNotificationMode.MUTE -> stringResource(id = CommonStrings.common_mute)
168169
null -> ""
169170
}
@@ -177,16 +178,16 @@ private fun InvalidNotificationSettingsView(
177178
) {
178179
DialogLikeBannerMolecule(
179180
modifier = modifier,
180-
title = stringResource(CommonStrings.screen_notification_settings_configuration_mismatch),
181-
content = stringResource(CommonStrings.screen_notification_settings_configuration_mismatch_description),
181+
title = stringResource(R.string.screen_notification_settings_configuration_mismatch),
182+
content = stringResource(R.string.screen_notification_settings_configuration_mismatch_description),
182183
onSubmitClicked = onContinueClicked,
183184
onDismissClicked = null,
184185
)
185186

186187
if (showError) {
187188
ErrorDialog(
188189
title = stringResource(id = CommonStrings.dialog_title_error),
189-
content = stringResource(id = CommonStrings.screen_notification_settings_failed_fixing_configuration),
190+
content = stringResource(id = R.string.screen_notification_settings_failed_fixing_configuration),
190191
onDismiss = onDismissError
191192
)
192193
}

‎features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import androidx.compose.ui.Modifier
2727
import androidx.compose.ui.res.stringResource
2828
import androidx.compose.ui.semantics.Role
2929
import androidx.compose.ui.unit.dp
30+
import io.element.android.features.preferences.impl.R
3031
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
3132
import io.element.android.libraries.designsystem.preview.ElementPreview
3233
import io.element.android.libraries.designsystem.theme.components.RadioButton
3334
import io.element.android.libraries.designsystem.theme.components.Text
3435
import io.element.android.libraries.matrix.api.room.RoomNotificationMode
3536
import io.element.android.libraries.theme.ElementTheme
36-
import io.element.android.libraries.ui.strings.CommonStrings
3737

3838
@Composable
3939
fun DefaultNotificationSettingOption(
@@ -43,8 +43,8 @@ fun DefaultNotificationSettingOption(
4343
onOptionSelected: (RoomNotificationMode) -> Unit = {},
4444
) {
4545
val subtitle = when(mode) {
46-
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = CommonStrings.screen_notification_settings_edit_mode_all_messages)
47-
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> stringResource(id = CommonStrings.screen_notification_settings_edit_mode_mentions_and_keywords)
46+
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
47+
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
4848
else -> ""
4949
}
5050
Row(

‎features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.compose.runtime.Composable
2222
import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.res.stringResource
2424
import androidx.compose.ui.tooling.preview.PreviewParameter
25+
import io.element.android.features.preferences.impl.R
2526
import io.element.android.libraries.designsystem.components.async.AsyncView
2627
import io.element.android.libraries.designsystem.components.avatar.Avatar
2728
import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -49,9 +50,9 @@ fun EditDefaultNotificationSettingView(
4950
modifier: Modifier = Modifier,
5051
) {
5152
val title = if (state.isOneToOne) {
52-
CommonStrings.screen_notification_settings_direct_chats
53+
R.string.screen_notification_settings_direct_chats
5354
} else {
54-
CommonStrings.screen_notification_settings_group_chats
55+
R.string.screen_notification_settings_group_chats
5556
}
5657
PreferencePage(
5758
modifier = modifier,
@@ -63,9 +64,9 @@ fun EditDefaultNotificationSettingView(
6364
val validModes = listOf(RoomNotificationMode.ALL_MESSAGES, RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY)
6465

6566
val categoryTitle = if (state.isOneToOne) {
66-
CommonStrings.screen_notification_settings_edit_screen_direct_section_header
67+
R.string.screen_notification_settings_edit_screen_direct_section_header
6768
} else {
68-
CommonStrings.screen_notification_settings_edit_screen_group_section_header
69+
R.string.screen_notification_settings_edit_screen_group_section_header
6970
}
7071
PreferenceCategory(title = stringResource(id = categoryTitle)) {
7172

@@ -82,12 +83,12 @@ fun EditDefaultNotificationSettingView(
8283
}
8384
}
8485
if (state.roomsWithUserDefinedMode.isNotEmpty()) {
85-
PreferenceCategory(title = stringResource(id = CommonStrings.screen_notification_settings_edit_custom_settings_section_title)) {
86+
PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_edit_custom_settings_section_title)) {
8687
state.roomsWithUserDefinedMode.forEach { summary ->
8788
val subtitle = when (summary.details.notificationMode) {
88-
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = CommonStrings.screen_notification_settings_edit_mode_all_messages)
89+
RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
8990
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
90-
stringResource(id = CommonStrings.screen_notification_settings_edit_mode_mentions_and_keywords)
91+
stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
9192
}
9293
RoomNotificationMode.MUTE -> stringResource(id = CommonStrings.common_mute)
9394
null -> ""
@@ -117,7 +118,7 @@ fun EditDefaultNotificationSettingView(
117118
}
118119
AsyncView(
119120
async = state.changeNotificationSettingAction,
120-
errorMessage = { stringResource(CommonStrings.screen_notification_settings_edit_failed_updating_default_mode) },
121+
errorMessage = { stringResource(R.string.screen_notification_settings_edit_failed_updating_default_mode) },
121122
onErrorDismiss = { state.eventSink(EditDefaultNotificationSettingStateEvents.ClearError) },
122123
onSuccess = {},
123124
)

‎features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.stringResource
2828
import androidx.compose.ui.text.style.TextAlign
2929
import androidx.compose.ui.tooling.preview.PreviewParameter
3030
import androidx.compose.ui.unit.dp
31+
import io.element.android.features.preferences.impl.R
3132
import io.element.android.features.preferences.impl.user.UserPreferences
3233
import io.element.android.libraries.designsystem.components.list.ListItemContent
3334
import io.element.android.libraries.designsystem.components.preferences.PreferencePage
@@ -116,7 +117,7 @@ fun PreferencesRootView(
116117
}
117118
if (state.showNotificationSettings) {
118119
ListItem(
119-
headlineContent = { Text(stringResource(id = CommonStrings.screen_notification_settings_title)) },
120+
headlineContent = { Text(stringResource(id = R.string.screen_notification_settings_title)) },
120121
leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_compound_notifications)),
121122
onClick = onOpenNotificationSettings,
122123
)

‎features/preferences/impl/src/main/res/values-cs/translations.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,31 @@
1212
<string name="screen_edit_profile_error_title">"Nelze aktualizovat profil"</string>
1313
<string name="screen_edit_profile_title">"Upravit profil"</string>
1414
<string name="screen_edit_profile_updating_details">"Aktualizace profilu…"</string>
15+
<string name="screen_notification_settings_additional_settings_section_title">"Další nastavení"</string>
16+
<string name="screen_notification_settings_calls_label">"Halsové a video hovory"</string>
17+
<string name="screen_notification_settings_configuration_mismatch">"Neshoda konfigurace"</string>
18+
<string name="screen_notification_settings_configuration_mismatch_description">"Zjednodušili jsme nastavení oznámení, abychom usnadnili hledání možností.
19+
20+
Některá vlastní nastavení, která jste si vybrali v minulosti, se zde nezobrazují, ale jsou stále aktivní.
21+
22+
Pokud budete pokračovat, některá nastavení se mohou změnit."</string>
23+
<string name="screen_notification_settings_direct_chats">"Přímé zprávy"</string>
24+
<string name="screen_notification_settings_edit_custom_settings_section_title">"Vlastní nastavení pro chat"</string>
25+
<string name="screen_notification_settings_edit_failed_updating_default_mode">"Při aktualizaci nastavení oznámení došlo k chybě."</string>
26+
<string name="screen_notification_settings_edit_mode_all_messages">"Všechny zprávy"</string>
27+
<string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Pouze zmínky a klíčová slova"</string>
28+
<string name="screen_notification_settings_edit_screen_direct_section_header">"V přímých zprávách mě upozornit na"</string>
29+
<string name="screen_notification_settings_edit_screen_group_section_header">"Ve skupinových chatech mě upozornit na"</string>
30+
<string name="screen_notification_settings_enable_notifications">"Povolit oznámení na tomto zařízení"</string>
31+
<string name="screen_notification_settings_failed_fixing_configuration">"Konfigurace nebyla opravena, zkuste to prosím znovu."</string>
32+
<string name="screen_notification_settings_group_chats">"Skupinové chaty"</string>
33+
<string name="screen_notification_settings_mentions_section_title">"Zmínky"</string>
34+
<string name="screen_notification_settings_mode_all">"Vše"</string>
35+
<string name="screen_notification_settings_mode_mentions">"Zmínky"</string>
36+
<string name="screen_notification_settings_notification_section_title">"Upozornit mě na"</string>
37+
<string name="screen_notification_settings_room_mention_label">"Upozornit mě na @room"</string>
38+
<string name="screen_notification_settings_system_notifications_action_required">"Chcete-li dostávat oznámení, změňte prosím svůj %1$s."</string>
39+
<string name="screen_notification_settings_system_notifications_action_required_content_link">"systémová nastavení"</string>
40+
<string name="screen_notification_settings_system_notifications_turned_off">"Systémová oznámení byla vypnuta"</string>
41+
<string name="screen_notification_settings_title">"Oznámení"</string>
1542
</resources>

‎features/preferences/impl/src/main/res/values-de/translations.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,27 @@
88
<string name="screen_edit_profile_error_title">"Profil kann nicht aktualisiert werden"</string>
99
<string name="screen_edit_profile_title">"Profil bearbeiten"</string>
1010
<string name="screen_edit_profile_updating_details">"Profil wird aktualisiert…"</string>
11+
<string name="screen_notification_settings_additional_settings_section_title">"Zusätzliche Einstellungen"</string>
12+
<string name="screen_notification_settings_calls_label">"Audio- und Videoanrufe"</string>
13+
<string name="screen_notification_settings_configuration_mismatch">"Konfiguration stimmt nicht überein"</string>
14+
<string name="screen_notification_settings_configuration_mismatch_description">"Wir haben die Einstellungen für Benachrichtigungen vereinfacht, damit die Optionen leichter zu finden sind. Einige benutzerdefinierte Einstellungen, die du in der Vergangenheit gewählt hast, werden hier nicht angezeigt, sind aber immer noch aktiv. Wenn du fortfährst, können sich einige deiner Einstellungen ändern."</string>
15+
<string name="screen_notification_settings_direct_chats">"Direkte Chats"</string>
16+
<string name="screen_notification_settings_edit_custom_settings_section_title">"Benutzerdefinierte Einstellung pro Chat"</string>
17+
<string name="screen_notification_settings_edit_failed_updating_default_mode">"Beim Aktualisieren der Benachrichtigungseinstellungen ist ein Fehler aufgetreten."</string>
18+
<string name="screen_notification_settings_edit_mode_all_messages">"Alle Nachrichten"</string>
19+
<string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Nur Erwähnungen und Schlüsselwörter"</string>
20+
<string name="screen_notification_settings_edit_screen_direct_section_header">"Bei direkten Chats, benachrichtige mich bei"</string>
21+
<string name="screen_notification_settings_edit_screen_group_section_header">"Bei Gruppenchats benachrichtige mich bei"</string>
22+
<string name="screen_notification_settings_enable_notifications">"Benachrichtigungen auf diesem Gerät aktivieren"</string>
23+
<string name="screen_notification_settings_failed_fixing_configuration">"Die Konfiguration wurde nicht korrigiert, bitte versuche es erneut."</string>
24+
<string name="screen_notification_settings_group_chats">"Gruppenchats"</string>
25+
<string name="screen_notification_settings_mentions_section_title">"Erwähnungen"</string>
26+
<string name="screen_notification_settings_mode_all">"Alle"</string>
27+
<string name="screen_notification_settings_mode_mentions">"Erwähnungen"</string>
28+
<string name="screen_notification_settings_notification_section_title">"Benachrichtige mich bei"</string>
29+
<string name="screen_notification_settings_room_mention_label">"Benachrichtige mich bei @room"</string>
30+
<string name="screen_notification_settings_system_notifications_action_required">"Um Benachrichtigungen zu erhalten, ändere bitte deine %1$s."</string>
31+
<string name="screen_notification_settings_system_notifications_action_required_content_link">"Systemeinstellungen"</string>
32+
<string name="screen_notification_settings_system_notifications_turned_off">"Systembenachrichtigungen deaktiviert"</string>
33+
<string name="screen_notification_settings_title">"Benachrichtigungen"</string>
1134
</resources>

0 commit comments

Comments
 (0)