Skip to content

Commit 1a7cf72

Browse files
authored
fix: default vocalization of back button of toolbar top component (#1577) (#1620)
Add missing localized string "core_common_back" Closes #1577 Reported-by: Jean-Luc Chevalier <jl.chevalier@orange.com> Reviewed-by: Copilot <198982749+Copilot@users.noreply.github.com> Signed-off-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>
1 parent 8c55ad5 commit 1a7cf72

38 files changed

Lines changed: 67 additions & 42 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- `View modifier` to add custom accessibility traits inside `text area` component (Orange-OpenSource/ouds-ios#1597)
1212
- Flag to let `link` component take full width (Orange-OpenSource/ouds-ios#1576)
1313
- Component tokens for `accordions`, `progress indicators` and `typography` components (tokens library v2.6.0) (Orange-OpenSource/ouds-ios#1579)
14-
- Semantic tokens of `colors` dedicated to AI (tokens library v2.6.0) (Orange-OpenSource/ouds-ios#1579)
14+
- Semantic tokens of `colors` dedicated to AI (tokens library v2.6.0) (Orange-OpenSource/ouds-ios#1579)
1515
- Components tokens for `list item` (tokens library v2.6.0) (Orange-OpenSource/ouds-ios#1579)
1616
- Components tokens for `button` dedicated to AI (tokens library v2.6.0) (Orange-OpenSource/ouds-ios#1579)
1717

@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3434

3535
### Fixed
3636

37+
- Missing "core_common_back" localized string for `back` button of `toolbar top` component (Orange-OpenSource/ouds-ios#1577)
3738
- For `alert` components, add default vocalisation on "info" status (Orange-OpenSource/ouds-ios#1561)
3839
- Icon assets for unordered `bullet list` item not displayed (Orange-OpenSource/ouds-ios#1615)
3940

OUDS/Core/Components/Sources/Navigations/ToolBar/OUDSToolBarItem.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ public struct OUDSToolBarItem: View, Identifiable {
141141
/// **Warning: if OS is iOS 26+ / Liquid Glass, the label will not appear**
142142
///
143143
/// - Parameters:
144-
/// - label; The optional string label displayed near to the back indicator
145-
/// - accessibilityLabel: The accessibility label to describe the back action that could be overtied if needed,d efault set to *core_common_back*
144+
/// - label: The optional string label displayed near to the back indicator
145+
/// - accessibilityLabel: The accessibility label to describe the back action that could be overridden if needed, default set to *core_common_back*
146146
/// - action: The action to do when clicked. If *nil* (default) the button is disabled. By default the dismiss is done after `action` is called..
147147
case back(label: String? = nil, accessibilityLabel: String = "core_common_back".localized(), action: (() -> Void)? = nil)
148148

OUDS/Core/Components/Sources/_/Resources/Localizable.xcstrings

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,30 @@
478478
}
479479
}
480480
},
481+
"core_common_back" : {
482+
"comment" : "Common",
483+
"extractionState" : "manual",
484+
"localizations" : {
485+
"ar" : {
486+
"stringUnit" : {
487+
"state" : "translated",
488+
"value" : "خلف"
489+
}
490+
},
491+
"en" : {
492+
"stringUnit" : {
493+
"state" : "translated",
494+
"value" : "Back"
495+
}
496+
},
497+
"fr" : {
498+
"stringUnit" : {
499+
"state" : "translated",
500+
"value" : "Retour"
501+
}
502+
}
503+
}
504+
},
481505
"core_common_close_a11y" : {
482506
"comment" : "Common",
483507
"extractionState" : "manual",

OUDS/Core/Themes/Orange/Sources/Providers/SemanticTokens/OrangeThemeColorChartSemanticTokensProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import OUDSThemesContract
2020
/// This provider should be integrated as a `AllColorChartSemanticTokensProvider` implementation inside `OUDSTheme` so as to provide
2121
/// all tokens to the users.
2222
///
23-
/// The tokens it exposes cannot be overriden as these colors are strongly related to the Orange brand.
23+
/// The tokens it exposes cannot be overridden as these colors are strongly related to the Orange brand.
2424
///
2525
/// If you think you need to overide some colors or have your own set of colors, start a new discussion (https://github.com/Orange-OpenSource/ouds-ios/discussions/categories/q-a).
2626
///

OUDS/Core/Themes/Orange/Sources/Providers/SemanticTokens/OrangeThemeColorDecorativeSemanticTokensProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import OUDSThemesContract
2020
/// This provider should be integrated as a `AllColorDecorativeSemanticTokensProvider` implementation inside `OUDSTheme` so as to provide
2121
/// all tokens to the users.
2222
///
23-
/// The tokens it exposes cannot be overriden as these colors are strongly related to the Orange brand.
23+
/// The tokens it exposes cannot be overridden as these colors are strongly related to the Orange brand.
2424
///
2525
/// If you think you need to overide some colors or have your own set of colors, start a new discussion (https://github.com/Orange-OpenSource/ouds-ios/discussions/categories/q-a).
2626
///

OUDS/Core/Themes/Orange/Sources/Values/SemanticTokens/OrangeTheme+ColorChartMultipleSemanticTokens.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import OUDSTokensSemantic
2121
// swiftlint:disable line_length
2222

2323
/// Defines provider objects for `semanticTokens` so as to pack them as light and dark modes colors.
24-
/// These values cannot be overriden as not specified / allowed, forbidden by design.
24+
/// These values cannot be overridden as not specified / allowed, forbidden by design.
2525
///
2626
/// Helps to expose color chart semantic tokens with two values to use depending to the color scheme (*Figma* cannot manage such tokens and generate them).
2727
extension OrangeThemeColorChartSemanticTokensProvider: ColorChartMultipleSemanticTokens {

OUDS/Core/Themes/Orange/Sources/Values/SemanticTokens/OrangeTheme+ColorModeMultipleSemanticTokens.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import SwiftUI
2323
// swiftlint:disable line_length
2424

2525
/// Defines provider objects for `ColorModeSemanticTokens` so as to pack them as light and dark modes colors.
26-
/// These values can be overriden inside `OrangeThemeColorModeSemanticTokensProvider` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
26+
/// These values can be overridden inside `OrangeThemeColorModeSemanticTokensProvider` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
2727
extension OrangeThemeColorModeSemanticTokensProvider: ColorModeMultipleSemanticTokens {
2828

2929
// MARK: - Multiple tokens

OUDS/Core/Themes/Orange/Sources/Values/SemanticTokens/OrangeTheme+ColorMultipleSemanticTokens.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import OUDSTokensSemantic
2121
// swiftlint:disable line_length
2222

2323
/// Defines provider objects for `ColorSemanticTokens` so as to pack them as light and dark modes colors.
24-
/// These values can be overriden inside `OrangeThemeColorSemanticTokensProvider` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
25-
/// Some tokens do not have values assigned in the design system, and must be overriden.
26-
/// Some tokens must be overriden in `OrangeTheme` side because they rely on Orange brand colors.
24+
/// These values can be overridden inside `OrangeThemeColorSemanticTokensProvider` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
25+
/// Some tokens do not have values assigned in the design system, and must be overridden.
26+
/// Some tokens must be overridden in `OrangeTheme` side because they rely on Orange brand colors.
2727
/// Helps to expose color semantic tokens with two values to use depending to the color scheme (*Figma* cannot manage such tokens and generate them).
2828
extension OrangeThemeColorSemanticTokensProvider: ColorMultipleSemanticTokens {
2929

OUDS/Core/Themes/Orange/Sources/Values/SemanticTokens/OrangeTheme+ElevationCompositeSemanticTokens.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import OUDSTokensSemantic
2020
// Create an issue for update https://github.com/Orange-OpenSource/ouds-ios/issues/new?template=token_update.yml
2121

2222
/// Defines basic values common to all themes for `ElevationCompositeSemanticTokens``.
23-
/// These values can be overriden inside ``OrangeThemeElevationSemanticTokensProvider`` subclasses
23+
/// These values can be overridden inside ``OrangeThemeElevationSemanticTokensProvider`` subclasses
2424
/// (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
2525
/// The aim of this extension is to make relationships between all semantic tokens for elevations and associated raw tokens.
2626
/// The *tokenator* is not able to provide code for such "composite" objects because the *Figma* tool itself cannot manage that and does not output anything in its JSON to process.

OUDS/Core/Themes/Orange/Sources/Values/SemanticTokens/OrangeTheme+ElevationMultipleSemanticTokens.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import OUDSTokensSemantic
2121
// swiftlint:disable line_length
2222

2323
/// Defines provider objects for elevation semantic tokens but "multiple", i.e. tokens with values depending to color schemes.
24-
/// These values can be overriden inside `OrangeThemeElevationSemanticTokensProvider` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
24+
/// These values can be overridden inside `OrangeThemeElevationSemanticTokensProvider` subclasses (in extensions or not, in the same module or not) thanks to the `@objc open` combination.
2525
extension OrangeThemeElevationSemanticTokensProvider: ElevationMultipleSemanticTokens {
2626

2727
@objc open var colorElevated: ElevationMultipleColorSemanticToken { MultipleColorSemanticToken(light: colorElevatedLight, dark: colorElevatedDark) }

0 commit comments

Comments
 (0)