fix strings

Signed-off-by: Vadym Struts <[email protected]>
brave · Jan 8, 2025 · 665778f · 665778f
1 parent d478494
commit 665778f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
@@ -7,9 +7,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.text.Spannable;
 import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 
 import androidx.preference.Preference;
@@ -298,17 +296,15 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         mBlockCrosssiteCookiesLearnMore =
                 (TextMessagePreference) findPreference(BLOCK_CROSS_SITE_COOKIES_LEARN_MORE);
         if (mBlockCrosssiteCookiesLearnMore != null) {
-            SpannableString blockAllCookiesDeprecatedWarning =
-                    new SpannableString(getString(R.string.block_cookies_deprecated_label));
-            blockAllCookiesDeprecatedWarning.setSpan(
-                    new ForegroundColorSpan(getContext().getColor(R.color.wallet_error_text_color)),
-                    0,
-                    blockAllCookiesDeprecatedWarning.length(),
-                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
             SpannableString learnMoreDesc =
                     SpanApplier.applySpans(
-                            getString(R.string.block_cookies_deprecated_link_label),
+                            getString(R.string.block_cookies_deprecated_label),
+                            new SpanApplier.SpanInfo(
+                                    "<LINK_0>",
+                                    "</LINK_0>",
+                                    new ForegroundColorSpan(
+                                            getContext()
+                                                    .getColor(R.color.wallet_error_text_color))),
                             new SpanApplier.SpanInfo(
                                     "<LINK_1>",
                                     "</LINK_1>",
@@ -320,10 +316,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                                                         requireContext(),
                                                         BLOCK_ALL_COOKIES_LEARN_MORE_LINK);
                                             })));
-            SpannableStringBuilder spannableBuilder = new SpannableStringBuilder();
-            spannableBuilder.append(blockAllCookiesDeprecatedWarning);
-            spannableBuilder.append(learnMoreDesc);
-            mBlockCrosssiteCookiesLearnMore.setSummary(spannableBuilder);
+            mBlockCrosssiteCookiesLearnMore.setSummary(learnMoreDesc);
         }
 
         mBlockScriptsPref = (ChromeSwitchPreference) findPreference(PREF_BLOCK_SCRIPTS);

diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
@@ -1550,10 +1550,7 @@ Are you sure you want to do this?
         Allow all trackers &amp; ads
       </message>
       <message name="IDS_BLOCK_COOKIES_DEPRECATED_LABEL" desc="Block all cookies deprecation warning">
-        The "Block all Cookies" option has been deprecated. To learn how to force-enable this option, visit
-      </message>
-      <message name="IDS_BLOCK_COOKIES_DEPRECATED_LINK_LABEL" desc="Block all cookies deprecation warning link">
-        <ph name="BEGIN_LINK_1">&lt;LINK_1&gt;</ph> our help page<ph name="END_LINK_1">&lt;/LINK_1&gt;</ph>
+        <ph name="BEGIN_LINK_0">&lt;LINK_0&gt;</ph>The "Block all Cookies" option has been deprecated. To learn how to force-enable this option, visit<ph name="END_LINK_0">&lt;/LINK_0&gt;</ph> <ph name="BEGIN_LINK_1">&lt;LINK_1&gt;</ph>our help page<ph name="END_LINK_1">&lt;/LINK_1&gt;</ph>
       </message>
       <message name="IDS_BLOCK_COOKIES" desc="Title for shields option.">
         Block Cookies