diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 2d50110b2a04..221f2f0a303e 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -133,9 +133,9 @@ public void prepareMenu(Menu menu, AppMenuHandler handler) { vpnLocationSubMenu.findItem(R.id.request_vpn_location_id); String isoCode = BraveVpnPrefUtils.getRegionIsoCode(); String country = - (!BraveVpnPrefUtils.getRegionCountry().equals("") + !BraveVpnPrefUtils.getRegionCountry().equals("") ? BraveVpnPrefUtils.getRegionCountry() - : new Locale("", isoCode).getDisplayCountry()); + : new Locale("", isoCode).getDisplayCountry(); vpnLocationSubMenuItem.setTitle( String.format( diff --git a/components/brave_vpn/resources/panel/stories/mock-data/region-list.ts b/components/brave_vpn/resources/panel/stories/mock-data/region-list.ts index 9248883d3517..44dd645feed4 100644 --- a/components/brave_vpn/resources/panel/stories/mock-data/region-list.ts +++ b/components/brave_vpn/resources/panel/stories/mock-data/region-list.ts @@ -10,6 +10,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Oceania', + 'country': 'Australia', 'countryIsoCode': 'AU', 'latitude': 151.2070530275259, 'longitude': -33.867749537753284, @@ -22,6 +23,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Oceania', + 'country': 'Australia', 'countryIsoCode': 'AU', 'latitude': 133.79969396159765, 'longitude': -23.62305911440252, @@ -35,6 +37,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Austria', 'countryIsoCode': 'AT', 'latitude': 16.361628116335655, 'longitude': 48.20392172247492, @@ -47,6 +50,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Austria', 'countryIsoCode': 'AT', 'latitude': 13.833811946421187, 'longitude': 47.490394433887666, @@ -60,6 +64,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Belgium', 'countryIsoCode': 'BE', 'latitude': 4.374847958682745, 'longitude': 50.838778068842664, @@ -72,6 +77,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Belgium', 'countryIsoCode': 'BE', 'latitude': 4.733776325426172, 'longitude': 50.712750850845715, @@ -85,6 +91,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'South-America', + 'country': 'Brazil', 'countryIsoCode': 'BR', 'latitude': -46.63611733672991, 'longitude': -23.547575340603583, @@ -97,6 +104,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'South-America', + 'country': 'Brazil', 'countryIsoCode': 'BR', 'latitude': -48.99593985069093, 'longitude': -12.240989380800045, @@ -110,6 +118,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'North-America', + 'country': 'Canada', 'countryIsoCode': 'CA', 'latitude': -79.39835761830456, 'longitude': 43.7064997964195, @@ -122,6 +131,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'North-America', + 'country': 'Canada', 'countryIsoCode': 'CA', 'latitude': -103.18476973580967, 'longitude': 58.781368758466364, @@ -135,6 +145,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'South-America', + 'country': 'Chile', 'countryIsoCode': 'CL', 'latitude': -70.6435850121368, 'longitude': -33.435239814529155, @@ -147,6 +158,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'South-America', + 'country': 'Chile', 'countryIsoCode': 'CL', 'latitude': -71.674414424191, 'longitude': -35.64236540944717, @@ -160,6 +172,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'South-America', + 'country': 'Colombia', 'countryIsoCode': 'CO', 'latitude': -74.09710852683152, 'longitude': 4.668568632587634, @@ -172,6 +185,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'South-America', + 'country': 'Colombia', 'countryIsoCode': 'CO', 'latitude': -73.086241587976, 'longitude': 3.7038764804835274, @@ -185,6 +199,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Croatia', 'countryIsoCode': 'HR', 'latitude': 15.987010863996636, 'longitude': 45.81014842329514, @@ -197,6 +212,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Croatia', 'countryIsoCode': 'HR', 'latitude': 15.351406746305031, 'longitude': 45.234230340424304, @@ -210,6 +226,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Czech-Republic', 'countryIsoCode': 'CZ', 'latitude': 14.43066765658731, 'longitude': 50.079133822253986, @@ -222,6 +239,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Czech-Republic', 'countryIsoCode': 'CZ', 'latitude': 15.156656921785457, 'longitude': 49.819154232007925, @@ -235,6 +253,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Denmark', 'countryIsoCode': 'DK', 'latitude': 12.578964037667108, 'longitude': 55.6843928421415, @@ -247,6 +266,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Denmark', 'countryIsoCode': 'DK', 'latitude': 10.327889179924739, 'longitude': 55.30869540361275, @@ -260,6 +280,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'England', 'countryIsoCode': 'GB', 'latitude': -0.08004383047700726, 'longitude': 51.51336761995574, @@ -272,6 +293,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'England', 'countryIsoCode': 'GB', 'latitude': -1.8644242280999657, 'longitude': 53.2004917527497, @@ -285,6 +307,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'France', 'countryIsoCode': 'FR', 'latitude': 3.0588674449756144, 'longitude': 50.633219501980975, @@ -297,6 +320,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'Europe', + 'country': 'France', 'countryIsoCode': 'FR', 'latitude': 2.3443157026941663, 'longitude': 48.86040883991442, @@ -309,6 +333,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'France', 'countryIsoCode': 'FR', 'latitude': 2.319752458173268, 'longitude': 46.86827587134022, @@ -322,6 +347,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Germany', 'countryIsoCode': 'DE', 'latitude': 8.68072449294419, 'longitude': 50.111452544261404, @@ -334,6 +360,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Germany', 'countryIsoCode': 'DE', 'latitude': 10.333714874017673, 'longitude': 51.1887516565091, @@ -347,6 +374,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Greece', 'countryIsoCode': 'GR', 'latitude': 23.72654560943824, 'longitude': 37.97159021247938, @@ -359,6 +387,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Greece', 'countryIsoCode': 'GR', 'latitude': 22.44098021821132, 'longitude': 39.61266200044209, @@ -372,6 +401,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Ireland', 'countryIsoCode': 'IE', 'latitude': -6.260546130127202, 'longitude': 53.34938898769911, @@ -384,6 +414,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Ireland', 'countryIsoCode': 'IE', 'latitude': -7.908198373580059, 'longitude': 53.35207843279358, @@ -397,6 +428,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Italy', 'countryIsoCode': 'IT', 'latitude': 9.189467832890369, 'longitude': 45.46436812557534, @@ -409,6 +441,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Italy', 'countryIsoCode': 'IT', 'latitude': 12.307849925210087, 'longitude': 43.24892791896981, @@ -422,6 +455,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Asia', + 'country': 'Japan', 'countryIsoCode': 'JP', 'latitude': 139.69105468946967, 'longitude': 35.68940973208437, @@ -434,6 +468,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Asia', + 'country': 'Japan', 'countryIsoCode': 'JP', 'latitude': 139.28533963672928, 'longitude': 37.334150531438006, @@ -447,6 +482,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'South-America', + 'country': 'Mexico', 'countryIsoCode': 'MX', 'latitude': -100.38872630519874, 'longitude': 20.58937508354671, @@ -459,6 +495,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'South-America', + 'country': 'Mexico', 'countryIsoCode': 'MX', 'latitude': -102.59612807183309, 'longitude': 24.297157717752373, @@ -472,6 +509,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Netherlands', 'countryIsoCode': 'NL', 'latitude': -74.01272871825755, 'longitude': 40.70817150833264, @@ -484,6 +522,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Netherlands', 'countryIsoCode': 'NL', 'latitude': -99.48423511920554, 'longitude': 38.98329697661361, @@ -497,6 +536,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Poland', 'countryIsoCode': 'PL', 'latitude': 21.014656085808774, 'longitude': 52.24773817919016, @@ -509,6 +549,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Poland', 'countryIsoCode': 'PL', 'latitude': 19.024892893585005, 'longitude': 52.28108864533875, @@ -522,6 +563,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Portugal', 'countryIsoCode': 'PT', 'latitude': -9.147228703563579, 'longitude': 38.710135849248005, @@ -534,6 +576,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Portugal', 'countryIsoCode': 'PT', 'latitude': -8.176493493980258, 'longitude': 39.70811236319081, @@ -547,6 +590,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Romania', 'countryIsoCode': 'RO', 'latitude': 26.088066758780734, 'longitude': 44.427599839299766, @@ -559,6 +603,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Romania', 'countryIsoCode': 'RO', 'latitude': 24.487998207239613, 'longitude': 45.86405473062903, @@ -572,6 +617,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Asia', + 'country': 'Singapore', 'countryIsoCode': 'SG', 'latitude': 103.85019137019486, 'longitude': 1.2900135414450815, @@ -584,6 +630,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Asia', + 'country': 'Singapore', 'countryIsoCode': 'SG', 'latitude': 103.7967572191037, 'longitude': 1.3827725407524207, @@ -597,6 +644,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Africa', + 'country': 'South Africa', 'countryIsoCode': 'ZA', 'latitude': 28.008016717693355, 'longitude': -26.237944409899388, @@ -609,6 +657,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Africa', + 'country': 'South Africa', 'countryIsoCode': 'ZA', 'latitude': 24.58123253279367, 'longitude': -28.79628000298281, @@ -622,6 +671,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Spain', 'countryIsoCode': 'ES', 'latitude': 2.1688887061063165, 'longitude': 41.38986582067356, @@ -634,6 +684,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'Europe', + 'country': 'Spain', 'countryIsoCode': 'ES', 'latitude': -3.7026954544494375, 'longitude': 40.41672352220537, @@ -646,6 +697,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Spain', 'countryIsoCode': 'ES', 'latitude': -3.75094389818205, 'longitude': 40.38042512259182, @@ -659,6 +711,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Sweden', 'countryIsoCode': 'SE', 'latitude': 18.070693012371176, 'longitude': 59.3252046597925, @@ -671,6 +724,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Sweden', 'countryIsoCode': 'SE', 'latitude': 16.096880065151236, 'longitude': 63.29228015205717, @@ -684,6 +738,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Switzerland', 'countryIsoCode': 'CH', 'latitude': 8.54168041057166, 'longitude': 47.37212922182809, @@ -696,6 +751,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Switzerland', 'countryIsoCode': 'CH', 'latitude': 8.230034125189793, 'longitude': 46.82176055287081, @@ -709,6 +765,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -77.47774982785495, 'longitude': 39.03002630109117, @@ -721,6 +778,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -84.37330216158185, 'longitude': 33.75708620650122, @@ -733,6 +791,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -87.65009116519116, 'longitude': 41.84985765685892, @@ -745,6 +804,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -104.99313771530903, 'longitude': 39.74680190141621, @@ -757,6 +817,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -96.8067432098152, 'longitude': 32.78321563339313, @@ -769,6 +830,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -118.30039020568758, 'longitude': 34.118819662669615, @@ -781,6 +843,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -80.21225580786931, 'longitude': 25.74633172978829, @@ -793,6 +856,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -74.00615560237677, 'longitude': 40.714292433330336, @@ -805,6 +869,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -122.33217344138617, 'longitude': 47.60636039205189, @@ -817,6 +882,7 @@ export const mockRegionList: Region[] = [ }, { 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -121.89499986041636, 'longitude': 37.33935623583346, @@ -829,6 +895,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'North-America', + 'country': 'USA', 'countryIsoCode': 'US', 'latitude': -101.69432971778862, 'longitude': 39.338586642335414, @@ -842,6 +909,7 @@ export const mockRegionList: Region[] = [ 'cities': [ { 'continent': 'Europe', + 'country': 'Ukraine', 'countryIsoCode': 'UA', 'latitude': 30.515942430190414, 'longitude': 50.458272443027305, @@ -854,6 +922,7 @@ export const mockRegionList: Region[] = [ } ], 'continent': 'Europe', + 'country': 'Ukraine', 'countryIsoCode': 'UA', 'latitude': 31.270893817426348, 'longitude': 49.125122273171755,