Merge pull request #26745 from brave/update_vpn_product_title

Update VPN product title at vpn panel
brave · Nov 26, 2024 · 613c1dd · 613c1dd
1 parent d24a54b
commit 613c1dd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/browser/ui/webui/brave_vpn/brave_vpn_localized_string_provider.cc b/browser/ui/webui/brave_vpn/brave_vpn_localized_string_provider.cc
@@ -16,7 +16,6 @@ namespace brave_vpn {
 void AddLocalizedStrings(content::WebUIDataSource* html_source) {
   static constexpr webui::LocalizedString kLocalizedStrings[] = {
       {"braveVpn", IDS_BRAVE_VPN},
-      {"braveVpnMainPanelTitle", IDS_BRAVE_VPN_MAIN_PANEL_TITLE},
       {"braveVpnConnect", IDS_BRAVE_VPN_CONNECT},
       {"braveVpnConnecting", IDS_BRAVE_VPN_CONNECTING},
       {"braveVpnConnected", IDS_BRAVE_VPN_CONNECTED},
@@ -33,7 +32,6 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) {
       {"braveVpnSettingsPanelHeader", IDS_BRAVE_VPN_SETTINGS_PANEL_HEADER},
       {"braveVpnSettingsPanelBackButtonAriaLabel",
        IDS_BRAVE_VPN_SETTINGS_PANEL_BACK_BUTTON_ARIA_LABEL},
-      {"braveVpnErrorPanelHeader", IDS_BRAVE_VPN_ERROR_PANEL_HEADER},
       {"braveVpnErrorPanelBackButtonAriaLabel",
        IDS_BRAVE_VPN_PANEL_GO_TO_MAIN_BUTTON_ARIA_LABEL},
       {"braveVpnStatus", IDS_BRAVE_VPN_STATUS},

diff --git a/components/brave_vpn/resources/panel/components/error-panel/index.tsx b/components/brave_vpn/resources/panel/components/error-panel/index.tsx
@@ -40,7 +40,7 @@ function ErrorPanel(props: Props) {
     <S.Box>
       <S.PanelContent>
         <PanelHeader
-          title={getLocale('braveVpnErrorPanelHeader')}
+          title={getLocale('braveVpn')}
           buttonAriaLabel={getLocale('braveVpnErrorPanelBackButtonAriaLabel')}
           onClick={handleShowMainView}
 

diff --git a/components/brave_vpn/resources/panel/components/loading-panel/index.tsx b/components/brave_vpn/resources/panel/components/loading-panel/index.tsx
@@ -44,7 +44,7 @@ function LoadingPanel() {
           tooltip={getLocale('braveVpnSettingsTooltip')}
           onClick={handleSettingsButtonClick}
         />
-        <PanelHeader title={getLocale('braveVpnMainPanelTitle')} />
+        <PanelHeader title={getLocale('braveVpn')} />
         <S.Status>
           <S.LoadingIcon />
           <S.PanelDesc>{getLocale('braveVpnLoading')}</S.PanelDesc>

diff --git a/components/brave_vpn/resources/panel/components/main-panel/index.tsx b/components/brave_vpn/resources/panel/components/main-panel/index.tsx
@@ -164,7 +164,7 @@ function MainPanel() {
           tooltip={getLocale('braveVpnSettingsTooltip')}
           onClick={handleSettingsButtonClick}
         />
-        <PanelHeader title={getLocale('braveVpnMainPanelTitle')} />
+        <PanelHeader title={getLocale('braveVpn')} />
         <Toggle disabled={expired} />
         {connectionStatus === ConnectionState.CONNECT_NOT_ALLOWED && (
           <S.StyledAlert

diff --git a/components/brave_vpn/resources/panel/stories/locale.ts b/components/brave_vpn/resources/panel/stories/locale.ts
@@ -5,8 +5,7 @@
 import { provideStrings } from '../../../../../.storybook/locale'
 
 provideStrings({
-  braveVpn: 'Brave Firewall + VPN',
-  braveVpnMainPanelTitle: 'Firewall + VPN',
+  braveVpn: 'Brave VPN',
   braveVpnConnect: 'Connect',
   braveVpnConnecting: 'Connecting',
   braveVpnConnected: 'Connected',
@@ -30,7 +29,6 @@ provideStrings({
   braveVpnReconnectAutomatically: 'Reconnect automatically',
   braveVpnContactSupport: 'Contact technical support',
   braveVpnAbout: 'About',
-  braveVpnErrorPanelHeader: 'Firewall + VPN',
   braveVpnErrorPanelBackButtonAriaLabel: 'Go to main',
   braveVpnFeature1: 'Extra privacy & security online',
   braveVpnFeature2: 'Hide your IP & change your location',

diff --git a/components/resources/brave_vpn_strings.grdp b/components/resources/brave_vpn_strings.grdp
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grit-part>
   <message name="IDS_BRAVE_VPN" translateable="false" desc="Title for VPN the product">
-    Brave Firewall + VPN
-  </message>
-
-  <message name="IDS_BRAVE_VPN_MAIN_PANEL_TITLE" translateable="false" desc="Title for VPN the product">
-    Firewall + VPN
+    Brave VPN
   </message>
 
   <message name="IDS_BRAVE_VPN_CONNECTED_TOOLTIP" desc="Status tooltip label when VPN has connected to a region">
-    Brave Firewall + VPN: Connected
+    Brave VPN: Connected
   </message>
 
   <message name="IDS_BRAVE_VPN_DISCONNECTED_TOOLTIP" desc="Status tooltip label when VPN has disconnected">
-    Brave Firewall + VPN: Disconnected
+    Brave VPN: Disconnected
   </message>
 
   <message name="IDS_BRAVE_VPN_PANEL_NAME" desc="The name of VPN panel">
@@ -78,10 +74,6 @@
     Close settings
   </message>
 
-  <message name="IDS_BRAVE_VPN_ERROR_PANEL_HEADER" desc="Text shown in header for error panel">
-    Firewall + VPN
-  </message>
-
   <message name="IDS_BRAVE_VPN_PANEL_GO_TO_MAIN_BUTTON_ARIA_LABEL" desc="Text for go to main button in panels">
     Go to main
   </message>