Skip to content

Commit 8ba075b

Browse files
committed
Multi accounts - localization
1 parent 3c9e3c1 commit 8ba075b

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
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
},

0 commit comments

Comments
 (0)