Skip to content

Commit ced6305

Browse files
committed
Multi accounts - localization
1 parent 190531d commit ced6305

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ fun LoginModeView(
9191
)
9292
}
9393
is AuthenticationException.AccountAlreadyLoggedIn -> {
94-
// TODO i18n
9594
ErrorDialog(
96-
content = "You're already logged in on this device as ${error.message}.",
95+
content = stringResource(CommonStrings.error_account_already_logged_in, error.message.orEmpty()),
9796
onSubmit = onClearError,
9897
)
9998
}

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ private fun AddOtherAccountScaffold(
145145
) {
146146
FlowStepPage(
147147
modifier = modifier,
148-
// TODO i18n
149-
title = "Add account",
148+
title = stringResource(CommonStrings.common_add_account),
150149
iconStyle = BigIcon.Style.Default(CompoundIcons.HomeSolid()),
151150
buttons = { buttons() },
152151
content = loginView,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private fun ColumnScope.MultiAccountSection(
148148
ListItem(
149149
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Plus())),
150150
headlineContent = {
151-
Text("Add another account")
151+
Text(stringResource(CommonStrings.common_add_another_account))
152152
},
153153
onClick = onAddAccountClick,
154154
)

libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectView.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import androidx.compose.foundation.lazy.items
1818
import androidx.compose.material3.ExperimentalMaterial3Api
1919
import androidx.compose.runtime.Composable
2020
import androidx.compose.ui.Modifier
21+
import androidx.compose.ui.res.stringResource
2122
import androidx.compose.ui.tooling.preview.PreviewParameter
2223
import androidx.compose.ui.unit.dp
2324
import io.element.android.libraries.designsystem.components.button.BackButton
@@ -28,6 +29,7 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
2829
import io.element.android.libraries.designsystem.theme.components.TopAppBar
2930
import io.element.android.libraries.matrix.api.core.SessionId
3031
import io.element.android.libraries.matrix.ui.components.MatrixUserRow
32+
import io.element.android.libraries.ui.strings.CommonStrings
3133

3234
@Suppress("MultipleEmitters") // False positive
3335
@OptIn(ExperimentalMaterial3Api::class)
@@ -43,8 +45,7 @@ fun AccountSelectView(
4345
modifier = modifier,
4446
topBar = {
4547
TopAppBar(
46-
// TODO i18n
47-
titleStr = "Select account",
48+
titleStr = stringResource(CommonStrings.common_select_account),
4849
navigationIcon = {
4950
BackButton(onClick = { onDismiss() })
5051
},

libraries/ui-strings/src/main/res/values/localazy.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<string name="a11y_remove_reaction_with">"Remove reaction with %1$s"</string>
4343
<string name="a11y_room_avatar">"Room avatar"</string>
4444
<string name="a11y_send_files">"Send files"</string>
45+
<string name="a11y_session_verification_time_limited_action_required">"Time limited action required, you have 1 minute to verify"</string>
4546
<string name="a11y_show_password">"Show password"</string>
4647
<string name="a11y_start_call">"Start a call"</string>
47-
<string name="a11y_time_limited_action_required">"Time limited action required"</string>
4848
<string name="a11y_tombstoned_room">"Tombstoned room"</string>
4949
<string name="a11y_user_avatar">"User avatar"</string>
5050
<string name="a11y_user_menu">"User menu"</string>
@@ -165,6 +165,8 @@
165165
<string name="banner_migrate_to_native_sliding_sync_title">"Upgrade available"</string>
166166
<string name="common_about">"About"</string>
167167
<string name="common_acceptable_use_policy">"Acceptable use policy"</string>
168+
<string name="common_add_account">"Add an account"</string>
169+
<string name="common_add_another_account">"Add another account"</string>
168170
<string name="common_adding_caption">"Adding caption"</string>
169171
<string name="common_advanced_settings">"Advanced settings"</string>
170172
<string name="common_an_image">"an image"</string>
@@ -294,6 +296,7 @@ Reason: %1$s."</string>
294296
<string name="common_search_results">"Search results"</string>
295297
<string name="common_security">"Security"</string>
296298
<string name="common_seen_by">"Seen by"</string>
299+
<string name="common_select_account">"Select an account"</string>
297300
<string name="common_send_to">"Send to"</string>
298301
<string name="common_sending">"Sending…"</string>
299302
<string name="common_sending_failed">"Sending failed"</string>
@@ -376,6 +379,8 @@ Are you sure you want to continue?"</string>
376379
<string name="dialog_video_quality_selector_subtitle_file_size">"The max file size allowed is: %1$s"</string>
377380
<string name="dialog_video_quality_selector_subtitle_no_file_size">"Select the quality of the video you want to upload."</string>
378381
<string name="dialog_video_quality_selector_title">"Select video upload quality"</string>
382+
<string name="emoji_picker_search_placeholder">"Search emojis"</string>
383+
<string name="error_account_already_logged_in">"You\'re already logged in on this device as %1$s."</string>
379384
<string name="error_account_creation_not_possible">"Your homeserver needs to be upgraded to support Matrix Authentication Service and account creation."</string>
380385
<string name="error_failed_creating_the_permalink">"Failed creating the permalink"</string>
381386
<string name="error_failed_loading_map">"%1$s could not load the map. Please try again later."</string>

0 commit comments

Comments
 (0)