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.

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

Additional "default browser" prompts: translations #5487

Closed
wants to merge 3 commits into from
Closed

Additional "default browser" prompts: translations #5487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6f94a7
Additional "default browser" prompts: copy updates
LukasPaczos Jan 31, 2025
9c0c22e
consolidate "Set As Default Browser" strings
LukasPaczos Dec 16, 2024
8e781c4
Additional "default browser" prompts: translations
LukasPaczos Jan 31, 2025
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: 0 additions & 11 deletions app/lint-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5364,17 +5364,6 @@
column="13"/>
</issue>

<issue
id="UnusedResources"
message="The resource `R.string.settingsDefaultBrowserEnabled` appears to be unused"
errorLine1=" &lt;string name=&quot;settingsDefaultBrowserEnabled&quot;>Set as Default Browser&lt;/string>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/strings.xml"
line="35"
column="13"/>
</issue>

<issue
id="UnusedResources"
message="The resource `R.string.addFavoriteMenuTitle` appears to be unused"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ class DefaultBrowserPage : OnboardingPageFragment(R.layout.content_onboarding_de
headerImage.setImageResource(R.drawable.set_as_default_browser_illustration_dialog)
subtitle.setText(R.string.defaultBrowserDescriptionNoDefault)
title.setText(R.string.onboardingDefaultBrowserTitle)
primaryButton.setText(R.string.defaultBrowserLetsDoIt)
primaryButton.setText(R.string.setAsDefaultBrowser)
setButtonsBehaviour()
}

private fun setUiForSettings() {
headerImage.setImageResource(R.drawable.set_as_default_browser_illustration_settings)
subtitle.setText(R.string.onboardingDefaultBrowserDescription)
title.setText(R.string.onboardingDefaultBrowserTitle)
primaryButton.setText(R.string.defaultBrowserLetsDoIt)
primaryButton.setText(R.string.setAsDefaultBrowser)
setButtonsBehaviour()
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-land/content_onboarding_default_browser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/defaultBrowserLetsDoIt"
android:text="@string/setAsDefaultBrowser"
app:buttonSize="large"
app:layout_constraintBottom_toTopOf="@+id/continueButton"
app:layout_constraintEnd_toEndOf="@+id/browserProtectionSubtitle"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/bottom_sheet_default_browser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:text="@string/defaultBrowserBottomSheetDialogPrimaryButton"
android:text="@string/setAsDefaultBrowser"
app:buttonSize="large" />

<com.duckduckgo.common.ui.view.button.DaxButtonGhost
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/content_onboarding_default_browser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="@dimen/keyline_1"
android:layout_height="wrap_content"
android:text="@string/defaultBrowserLetsDoIt"
android:text="@string/setAsDefaultBrowser"
app:layout_constraintBottom_toTopOf="@+id/continueButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/view_menu_item_default_browser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/settingsDefaultBrowserEnabled"
android:contentDescription="@string/setAsDefaultBrowser"
android:paddingHorizontal="12dp">

<!--Menu item's style defines horizontal padding as 24dp but we want the accent background
Expand All @@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/keyline_2"
android:text="@string/settingsDefaultBrowserEnabled"
android:text="@string/setAsDefaultBrowser"
android:textColor="@color/blue50"
app:typography="body1"
tools:ignore="InvalidColorAttribute" />
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values/donottranslate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,4 @@
<string name="newTabPageIndonesiaMessageBody">The government may be blocking access to duckduckgo.com on this network provider, which could affect this app\'s functionality. Other providers may not be affected.</string>
<string name="newTabPageIndonesiaMessageCta">Okay</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Protect your personal data every time with DuckDuckGo</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">If you love protecting your data, make us your default browser. All site links will open in DuckDuckGo.</string>
<string name="defaultBrowserBottomSheetDialogPrimaryButton">Set As Your Default Browser</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Not Now</string>

</resources>
8 changes: 6 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Can\'t launch default app settings screen</string>
<string name="settingsDefaultBrowserEnabled">Set as Default Browser</string>
<string name="setAsDefaultBrowser">Set As Default Browser</string>
<string name="defaultBrowserMaybeLater">Maybe Later</string>
<string name="defaultBrowserLetsDoIt">Set as Default Browser</string>
<string name="defaultBrowserDescriptionNoDefault">Open links with peace of mind, every time.</string>
<string name="defaultBrowserInstructions">Select DuckDuckGo and tap <font color='#678fff'>Always</font>.</string>

Expand Down Expand Up @@ -792,4 +791,9 @@
<string name="duckChatTitle">Duck.ai</string>
<string name="duckChatMenuItem">New AI Chat</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Let DuckDuckGo protect more of what you do online</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">Make us your default browser so all site links open in DuckDuckGo.</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Not Now</string>

</resources>
4 changes: 2 additions & 2 deletions ...les/src/test/java/com/duckduckgo/lint/ui/DeprecatedAndroidWidgetsUsedInXmlDetectorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class DeprecatedAndroidWidgetsUsedInXmlDetectorTest {
style="@style/SettingsSwitch"
android:paddingTop="14dp"
android:paddingBottom="14dp"
android:text="@string/settingsDefaultBrowserEnabled"
android:text="@string/setAsDefaultBrowser"
android:theme="@style/SettingsSwitchTheme" />


Expand Down Expand Up @@ -236,7 +236,7 @@ class DeprecatedAndroidWidgetsUsedInXmlDetectorTest {
style="@style/SettingsSwitch"
android:paddingTop="14dp"
android:paddingBottom="14dp"
android:text="@string/settingsDefaultBrowserEnabled"
android:text="@string/setAsDefaultBrowser"
android:theme="@style/SettingsSwitchTheme" />


Expand Down
Loading