Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update widget localised string identifiers #1714 #1763

Merged
merged 1 commit into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ruuvi-widgets/RuuviWidgets.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Intents
import SwiftUI
import WidgetKit
import RuuviLocalization

struct RuuviWidgetEntryView: View {
@Environment(\.widgetFamily) private var family
Expand Down Expand Up @@ -59,7 +60,7 @@ struct RuuviWidgets: Widget {
RuuviWidgetEntryView(entry: entry)
.environment(\.locale, viewModel.locale())
}.configurationDisplayName(Constants.simpleWidgetDisplayName.rawValue)
.description(LocalizedStringKey("Widgets.Description.message"))
.description(RuuviLocalization.Widgets.Description.message)
.supportedFamilies(supportedFamilies)
.contentMarginsDisabledIfAvailable()
}
Expand Down
11 changes: 6 additions & 5 deletions ruuvi-widgets/View/EmptyWidgetView.swift
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import SwiftUI
import RuuviLocalization

struct EmptyWidgetView: View {
@Environment(\.widgetFamily) private var family
struct Texts {
let messageSimple = "Widgets.Unconfigured.Simple.message"
let messageRectangular = "Widgets.Unconfigured.Rectangular.message"
let messageCircular = "Widgets.Unconfigured.Circular.message"
let messageInline = "Widgets.Unconfigured.Inline.message"
let loading = "Widgets.Loading.message"
let messageSimple = RuuviLocalization.Widgets.Unconfigured.Simple.message
let messageRectangular = RuuviLocalization.Widgets.Unconfigured.Rectangular.message
let messageCircular = RuuviLocalization.Widgets.Unconfigured.Circular.message
let messageInline = RuuviLocalization.Widgets.Unconfigured.Inline.message
let loading = RuuviLocalization.Widgets.Loading.message
}

private let texts = Texts()
Expand Down
7 changes: 4 additions & 3 deletions ruuvi-widgets/View/UnauthorizedView.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import SwiftUI
import RuuviLocalization

struct UnauthorizedView: View {
@Environment(\.widgetFamily) private var family
struct Texts {
let unauthorizedRegular = "Widgets.Unauthorized.Regular.message"
let unauthorizedSmall = "SignIn.Title.text"
let unauthorizedInline = "Widgets.Unauthorized.Inline.message"
let unauthorizedRegular = RuuviLocalization.Widgets.Unauthorized.Regular.message
let unauthorizedSmall = RuuviLocalization.SignIn.Title.text
let unauthorizedInline = RuuviLocalization.Widgets.Unauthorized.Inline.message
}

private let texts = Texts()
Expand Down
2 changes: 2 additions & 0 deletions widget_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@ targets:
- target: RuuviPersistence
embed: true
- target: RuuviContext
embed: true
- target: RuuviLocalization
embed: true
3 changes: 2 additions & 1 deletion widget_spm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ targets:
- package: RuuviPool
- package: RuuviLocal
- package: RuuviPersistence
- package: RuuviContext
- package: RuuviContext
- package: RuuviLocalization