Skip to content

fixes on some Buttons to make them use localization (issue #241) #242

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.

Sign up for GitHub

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

Open
ajiteshbankulaa wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fixes on some Buttons to make them use localization (issue #241) #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e51d44d
Localizables for settings.about fix
Feb 22, 2026
76e4ac9
Fix for Localizables in settings.about
Feb 22, 2026
7e54f62
added localization for Bose
Feb 22, 2026
be29dda
Removed the French
Feb 24, 2026
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
11 changes: 9 additions & 2 deletions apps/ios/GuideDogs/Assets/Localization/en-US.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@

/* Title of the slider that controls the volume level of all audio other than beacon or speech audio */
"settings.volume.other" = "Sound Effects";

//------------------------------------------------------------------------------
// MARK: Settings (Voice)
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -600,7 +599,7 @@
"settings.about.title.whats_new" = "What's New?";

/* Settings About Title, Privacy and Cookies */
"settings.about.title.privacy" = "Soundscape Community Privacy Statement";
"settings.about.title.privacy" = "Privacy Policy";

/* Settings About Title, Service Agreement */
"settings.about.title.service_agreement" = "Services Agreement";
Expand All @@ -611,6 +610,11 @@
/* Settings About Title, Copyright Notices */
"settings.about.title.copyright" = "Copyright Notices";

/* Settings About Title, YouTube */
"settings.about.title.youtube" = "YouTube Channel";



//------------------------------------------------------------------------------
// MARK: Settings (New Feature)
//------------------------------------------------------------------------------
Expand Down Expand Up @@ -2286,6 +2290,9 @@
/* List of the two supported AirPods versions, {NumberedPlaceholder="Apple AirPods"} */
"devices.airpods.supported_versions" = "Apple AirPods with spatial audio";

/* Device model name shown in UI */
"devices.Bose.model_name" = "Bose Frames Alto or Rondo";

/* Title of the screen displayed to users before they connect to their head tracking headphones which indicates that they need to first pair the device's audio in the iOS settings app */
"devices.title.pair_audio" = "Pair Headphones Audio";

Expand Down
2 changes: 1 addition & 1 deletion apps/ios/GuideDogs/Code/Sensors/Motion/Headphone Motion/BoseFramesMotionManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ enum BoseFramesMotionManagerStatus: Int, Equatable, Comparable {

class BoseFramesMotionManager: NSObject {

static let DEVICE_MODEL_NAME: String = GDLocalizationUnnecessary("Bose Frames (Rondo)")
static let DEVICE_MODEL_NAME: String = GDLocalizedString("devices.Bose.model_name")

// MARK: Attributes
private let queue: OperationQueue
Expand Down
40 changes: 29 additions & 11 deletions apps/ios/GuideDogs/Code/Visual UI/View Controllers/Settings/AboutViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,36 @@ class AboutApplicationViewController: BaseTableViewController {

private var aboutLinks: [AboutLinkCellModel] {
var links = [
AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.whats_new"), segue: "ShowVersionHistorySegue"),
AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Privacy Policy"), url: AppContext.Links.privacyPolicyURL(for: LocalizationContext.currentAppLocale), event: "about.privacy_policy"),
AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Services Agreement"), url: AppContext.Links.servicesAgreementURL(for: LocalizationContext.currentAppLocale), event: "about.services_agreement"),
AboutLinkCellModel(localizedTitle: GDLocalizedString("settings.about.title.copyright"), segue: "ShowThirdPartyNoticesSegue"),
AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("YouTube Channel"), url: AppContext.Links.youtubeURL(for: LocalizationContext.currentAppLocale), event: "about.youtube_channel")
]

if LocalizationContext.currentAppLocale == Locale.frFr {
// If the app is localized in fr-FR, include a link to the France Accessibility landing page
links.append(AboutLinkCellModel(localizedTitle: GDLocalizationUnnecessary("Accessibilité: partiellement conforme"), url: AppContext.Links.accessibilityFrance, event: "about.accessibility_fr_fr"))
}
AboutLinkCellModel(
localizedTitle: GDLocalizedString("settings.about.title.whats_new"),
segue: "ShowVersionHistorySegue"
),

AboutLinkCellModel(
localizedTitle: GDLocalizedString("settings.about.title.privacy"),
url: AppContext.Links.privacyPolicyURL(for: LocalizationContext.currentAppLocale),
event: "about.privacy_policy"
),

AboutLinkCellModel(
localizedTitle: GDLocalizedString("settings.about.title.service_agreement"),
url: AppContext.Links.servicesAgreementURL(for: LocalizationContext.currentAppLocale),
event: "about.services_agreement"
),

AboutLinkCellModel(
localizedTitle: GDLocalizedString("settings.about.title.third_party"),
segue: "ShowThirdPartyNoticesSegue"
),


AboutLinkCellModel(
localizedTitle: GDLocalizedString("settings.about.title.youtube"),
url: AppContext.Links.youtubeURL(for: LocalizationContext.currentAppLocale),
event: "about.youtube_channel"
)
]

return links
}

Expand Down
63 changes: 14 additions & 49 deletions apps/ios/GuideDogs/Code/Visual UI/Views/Settings.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="hMR-GT-OEB">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24127" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="hMR-GT-OEB">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24063"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -13,7 +13,7 @@
<objects>
<tableViewController storyboardIdentifier="settings" title="Settings" id="hMR-GT-OEB" customClass="SettingsViewController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="white" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="BFu-2Q-wai">
<rect key="frame" x="0.0" y="0.0" width="393" height="749"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="680"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="Background Base"/>
<color key="tintColor" name="Foreground 1"/>
Expand Down Expand Up @@ -41,7 +41,7 @@
</userDefinedRuntimeAttributes>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="globe" catalog="system" id="1L7-AG-6Os" customClass="TintedImageView" customModule="Soundscape" customModuleProvider="target">
<rect key="frame" x="22.166666666666668" y="12.666666666666664" width="19.666666666666664" height="19"/>
<rect key="frame" x="22.166666666666668" y="12.333333333333336" width="19.666666666666664" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="normalTintColor">
Expand Down Expand Up @@ -429,7 +429,7 @@
</userDefinedRuntimeAttributes>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="info.circle" catalog="system" id="5Pf-JY-3ZO" customClass="TintedImageView" customModule="Soundscape" customModuleProvider="target">
<rect key="frame" x="22.166666666666668" y="12.666666666666664" width="19.666666666666664" height="19"/>
<rect key="frame" x="22.166666666666668" y="12.333333333333336" width="19.666666666666664" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="normalTintColor">
Expand Down Expand Up @@ -515,7 +515,7 @@
</userDefinedRuntimeAttributes>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="questionmark.circle" catalog="system" id="do3-Rk-BTw" customClass="TintedImageView" customModule="Soundscape" customModuleProvider="target">
<rect key="frame" x="22.166666666666668" y="12.666666666666664" width="19.666666666666664" height="19"/>
<rect key="frame" x="22.166666666666668" y="12.333333333333336" width="19.666666666666664" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="normalTintColor">
Expand Down Expand Up @@ -683,7 +683,7 @@
</connections>
</switch>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" image="play.circle" catalog="system" id="43Y-tn-4fp" customClass="TintedImageView" customModule="Soundscape" customModuleProvider="target">
<rect key="frame" x="22.166666666666668" y="12.666666666666664" width="19.666666666666664" height="19"/>
<rect key="frame" x="22.166666666666668" y="12.333333333333336" width="19.666666666666664" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="normalTintColor">
Expand Down Expand Up @@ -745,7 +745,7 @@
<rect key="frame" x="178" y="407.66666666666669" width="37" height="37"/>
</activityIndicatorView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Loading Message..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kuo-JQ-xyD">
<rect key="frame" x="0.0" y="444.66666666666674" width="393" height="407.33333333333326"/>
<rect key="frame" x="0.0" y="444.66666666666674" width="393" height="373.33333333333326"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -811,7 +811,7 @@
<objects>
<tableViewController title="About" id="Cga-sE-k8S" customClass="AboutApplicationViewController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="white" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="0i1-ZR-Y6A">
<rect key="frame" x="0.0" y="0.0" width="393" height="749"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="680"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="Background Base"/>
<color key="tintColor" name="Foreground 1"/>
Expand Down Expand Up @@ -913,7 +913,7 @@
<viewControllerLayoutGuide type="bottom" id="yhW-wL-uJU"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Eay-la-zqJ">
<rect key="frame" x="0.0" y="0.0" width="393" height="749"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="680"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dgf-C8-XhY">
Expand All @@ -923,7 +923,7 @@
</constraints>
</view>
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZGZ-hV-5o6">
<rect key="frame" x="0.0" y="0.0" width="393" height="715"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="612"/>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<wkWebViewConfiguration key="configuration">
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
Expand Down Expand Up @@ -964,7 +964,7 @@
<objects>
<tableViewController title="What's New?" id="cV6-tJ-Lov" customClass="VersionHistoryTableViewController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="white" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="60" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ghn-Zm-Bk2">
<rect key="frame" x="0.0" y="0.0" width="393" height="749"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="680"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="Background Base"/>
<color key="tintColor" name="Foreground 1"/>
Expand Down Expand Up @@ -1022,7 +1022,7 @@
<objects>
<tableViewController title="Language" id="Vrs-lu-RFH" customClass="LanguageTableViewController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="white" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="60" sectionHeaderHeight="18" sectionFooterHeight="18" id="jo0-AK-0oI">
<rect key="frame" x="0.0" y="0.0" width="393" height="749"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="680"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="Background Base"/>
<color key="tintColor" name="Foreground 1"/>
Expand Down Expand Up @@ -1088,7 +1088,7 @@
<objects>
<tableViewController title="Siri Shortcuts" id="Vfw-dV-xPd" customClass="SiriShortcutsTableViewController" customModule="Soundscape" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" indicatorStyle="white" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="60" sectionHeaderHeight="18" sectionFooterHeight="18" id="J74-qC-McB">
<rect key="frame" x="0.0" y="0.0" width="393" height="749"/>
<rect key="frame" x="0.0" y="0.0" width="393" height="680"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="Background Base"/>
<color key="tintColor" name="Foreground 1"/>
Expand Down Expand Up @@ -1140,41 +1140,6 @@
<point key="canvasLocation" x="1155" y="-214"/>
</scene>
</scenes>
<designables>
<designable name="1L7-AG-6Os">
<size key="intrinsicContentSize" width="19.666666666666664" height="20.333333333333332"/>
</designable>
<designable name="43Y-tn-4fp">
<size key="intrinsicContentSize" width="19.666666666666664" height="20.333333333333332"/>
</designable>
<designable name="5Pf-JY-3ZO">
<size key="intrinsicContentSize" width="19.666666666666664" height="20.333333333333332"/>
</designable>
<designable name="Llf-5z-Yrv">
<size key="intrinsicContentSize" width="16.333333333333332" height="20.333333333333332"/>
</designable>
<designable name="V7c-Jp-nJI">
<size key="intrinsicContentSize" width="18.666666666666668" height="20.333333333333332"/>
</designable>
<designable name="Y2O-sy-jp9">
<size key="intrinsicContentSize" width="24" height="20.333333333333332"/>
</designable>
<designable name="Y3m-JJ-WMK">
<size key="intrinsicContentSize" width="25" height="20.333333333333332"/>
</designable>
<designable name="cya-42-Jaj">
<size key="intrinsicContentSize" width="27" height="20.333333333333332"/>
</designable>
<designable name="do3-Rk-BTw">
<size key="intrinsicContentSize" width="19.666666666666664" height="20.333333333333332"/>
</designable>
<designable name="k5P-R0-5zU">
<size key="intrinsicContentSize" width="19.333333333333332" height="20.333333333333332"/>
</designable>
<designable name="ozz-CI-zQP">
<size key="intrinsicContentSize" width="21" height="20.333333333333332"/>
</designable>
</designables>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<resources>
<image name="chart.bar.fill" catalog="system" width="128" height="90"/>
Expand Down