Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into default-engine-telemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jul 26, 2023
2 parents e05df4d + 6bb0d8f commit 02f472f
Show file tree
Hide file tree
Showing 13 changed files with 79 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Blockzilla.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6487,7 +6487,7 @@
repositoryURL = "https://github.com/mozilla/rust-components-swift";
requirement = {
kind = exactVersion;
version = 116.0.20230613143642;
version = 117.0.20230725050348;
};
};
CDFA746D27ABD43D0055FE55 /* XCRemoteSwiftPackageReference "glean-swift" */ = {
Expand Down Expand Up @@ -6527,7 +6527,7 @@
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
requirement = {
kind = exactVersion;
version = 8.6.0;
version = 8.8.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"repositoryURL": "https://github.com/mozilla/rust-components-swift",
"state": {
"branch": null,
"revision": "704fc65146b575b0eb64cef365f9c46c4845d291",
"version": "116.0.20230613143642"
"revision": "ecb16d82d54859f884adaca1b047d73d43039f3a",
"version": "117.0.20230725050348"
}
},
{
"package": "Sentry",
"repositoryURL": "https://github.com/getsentry/sentry-cocoa",
"state": {
"branch": null,
"revision": "e6dcfba32f2861438b82c7ad34e058b23c83daf6",
"version": "8.6.0"
"revision": "d277532e1c8af813981ba01f591b15bbdd735615",
"version": "8.8.0"
}
},
{
Expand Down
20 changes: 7 additions & 13 deletions Blockzilla/Nimbus/NimbusWrapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,22 @@ class NimbusWrapper {
fatalError("Failed to determine Nimbus database path")
}

let builder = NimbusBuilder(dbPath: databasePath)

let urlString = NimbusServerSettings.getNimbusEndpoint(useStagingServer: useStagingServer)?.absoluteString
builder.with(url: urlString)

let bundles = [
Bundle.main,
Bundle.main.fallbackTranslationBundle()
Bundle.main.fallbackTranslationBundle(language: "en-US")
].compactMap { $0 }

builder.with(bundles: bundles)
return NimbusBuilder(dbPath: databasePath)
.with(url: urlString)
.with(bundles: bundles)
.with(featureManifest: AppNimbus.shared)
.with(commandLineArgs: CommandLine.arguments)
.using(previewCollection: usePreviewCollection)
.with(initialExperiments: Bundle.main.url(forResource: "initial_experiments", withExtension: "json"))
.isFirstRun(isFirstRun)
.onCreate { nimbus in
AppNimbus.shared.initialize { nimbus }
}
.onApply { _ in
AppNimbus.shared.invalidateCachedValues()
}

return builder.build(appInfo: nimbusAppSettings)
.build(appInfo: nimbusAppSettings)
}()

func initializeRustComponents() throws {
Expand Down
3 changes: 3 additions & 0 deletions Blockzilla/br.lproj/Intents.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* (No Comment) */
"Intents.Erase.Description" = "Dilemel an estez merdeiñ";

/* (No Comment) */
"Intents.Erase.Title" = "Dilemel";

42 changes: 42 additions & 0 deletions Blockzilla/br.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@
/* Label for enabling or disabling top sites */
"Autocomplete.topSites" = "Lec'hiennoù gwellañ";

/* Title for the action button shown on the Splash Screen which gives the user the ability to log in with biometrics. */
"BiometricAuthentication.UnlockButton.Title" = "Dibrennañ";

/* Create a new session after failing a biometric check */
"BiometricPrompt.newSession" = "Estez nevez";

Expand Down Expand Up @@ -178,12 +181,21 @@
/* Text for a label that indicates the title of button from onboarding screen version 2. */
"NewOnboarding.Button.Title.V2" = "Kregiñ ganti";

/* Text for a label that indicates the subtitle for the onboarding screen version 2. */
"NewOnboarding.Subtitle.V2" = "Prim. Prevez. Disoursi.";

/* Text for a label that indicates the title of button from onboarding screen */
"Onboarding.Button.Title" = "Kregiñ gant ar merdeiñ";

/* Text for a label that indicates the title of the bottom button from the default browser onboarding screen version 2. */
"Onboarding.DefaultBrowser.BottomButtonTitle.V2" = "Tremen";

/* Text for a label that indicates the first subtitle for the default browser onboarding screen version 2. */
"Onboarding.DefaultBrowser.FirstSubtitle.V2" = "Evit muioc'h a vuhez prevez e vo skarzhet ar roll istor pa vo serret an arload.";

/* Text for a label that indicates the second subtitle for the default browser onboarding screen version 2. %@ is the name of the app (Focus/Klar) */
"Onboarding.DefaultBrowser.SecondSubtitle.V2" = "Lakaat %@ dre ziouer evit gwareziñ ho roadennoù gant pep liamm digoret.";

/* Text for a label that indicates the title for the default browser onboarding screen version 2. %@ is the name of the app (Focus/Klar) */
"Onboarding.DefaultBrowser.Title.V2" = "%@ n'eo ket evel ar verdeerien all";

Expand Down Expand Up @@ -280,6 +292,9 @@
/* Subtitle for Send Anonymous Usage Data toggle on main screen */
"Settings.learnMore" = "Gouzout hiroc'h.";

/* Lincese option in settings menu. Tapping the cell will take the user to a list of licences for the 3rd parties used in the app. */
"Settings.licenses" = "Lañvazioù";

/* Light theme option in settings menu */
"Settings.lightTheme" = "Sklaer";

Expand Down Expand Up @@ -463,6 +478,15 @@
/* This is the button text that is displayed in the Show Me How Onboarding Screen */
"ShowMeHowOnboarding.ButtonText.V2" = "Graet";

/* This is the subtitle text for step one that is displayed in the Show Me How Onboarding Screen */
"ShowMeHowOnboarding.SubtitleStepOne.V2" = "Stokit ar skramm degemer e-pad pell amzer betek ma hejfe an arlunioù.";

/* This is the subtitle text for step three that is displayed in the Show Me How onboarding screen. %@ is the name of the app (Focus/Klar) */
"ShowMeHowOnboarding.SubtitleStepThree.V2" = "Klask %@. Dibab ur widjet war-lec’h.";

/* This is the subtitle text for step two that is displayed in the Show Me How Onboarding Screen */
"ShowMeHowOnboarding.SubtitleStepTwo.V2" = "Pouezit an arlun mui.";

/* This is the title text that is displayed in the Show Me How Onboarding Screen. %@ is the name of the app (Focus/Klar) */
"ShowMeHowOnboarding.Title.V2" = "Ouzhpenn ur widjet %@";

Expand Down Expand Up @@ -544,9 +568,21 @@
/* This is the body text that is displayed for the Privacy tooltip */
"TooltipBodyText.Privacy" = "An arventennoù dre ziouer-se a ginnig ur gwarez kreñv. Aes eo kemmañ an arventennoù evit klotañ gant hoc’h ezhommoù resis.";

/* This is the body text that is displayed for the Search Bar tooltip */
"TooltipBodyText.SearchBar" = "Loc'hit hoc'h estez merdeiñ prevez ha stanket e vo an heulierien ha traoù fall all.";

/* This is the body text that is displayed for the Shield icon tooltip. Where placeholder can be (Focus or Klar). */
"TooltipBodyText.ShieldIcon" = "Miret en deus %@ da vezañ spiet gant al lec’hienn. Stokit ar skoed evit kaout titouroù war ar pezh a zo bet stanket.";

/* This is the body text that is displayed for the Shield icon tooltip when we block trackers for the first time on a website */
"TooltipBodyText.ShieldIconTrackerBlocked.V2" = "Tapet eo! Miret hon eus ac’hanoc’h da vezañ spiet gant al lec’hienn. Stokit ar skoed evit kaout titouroù war ar pezh a zo bet stanket.";

/* This is the body text that is displayed for the Trash icon tooltip */
"TooltipBodyText.TrashIcon" = "Stokit ar boubelenn pa fell deoc’h tennañ holl roudoù hoc’h estez bremanel.";

/* This is the body text that is displayed for the Trash icon tooltip */
"TooltipBodyText.TrashIcon.V2" = "Stokañ amañ da zilemel pep tra — roll istor, toupinoù, pep tra — ha loc'hañ en-dro en un ivinell nevez.";

/* This is the title text that is displayed for the Privacy tooltip */
"TooltipTitleText.Privacy" = "Gwarezet hoc’h!";

Expand Down Expand Up @@ -604,3 +640,9 @@
/* Title for the action button shown on card view that will take the user to a tutorial explaining the user how to add an widget */
"WidgetOnboardingCard.ActionButton" = "Diskouez din penaos ober";

/* Subtitle shown on card view explaining the app has a widget option. %@ is the name of the app (Focus/Klar). */
"WidgetOnboardingCard.Subtitle" = "Leuskel a reomp ac'hanoc'h da verdeiñ, met posupl e vo deoc'h kregiñ ganti buanoc'h ar wech a zeu a-drugarez d'ar widjed %@ war ho pajenn degemer.";

/* Title shown on card view explaining the app has a widget option */
"WidgetOnboardingCard.Title" = "Roll istor skarzhet! 🎉";

2 changes: 1 addition & 1 deletion Blockzilla/el.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"FirstRun.lastSlide.buttonLabel" = "OK, κατάλαβα!";

/* Message label on the first run screen */
"FirstRun.messageLabelTagline" = "Περιηγηθείτε σαν να μην σας βλέπει κανείς.";
"FirstRun.messageLabelTagline" = "Περιηγηθείτε σαν να μη σας βλέπει κανείς.";

/* Button label used to close a menu that displays as a popup. */
"Menu.Close" = "Κλείσιμο";
Expand Down
3 changes: 3 additions & 0 deletions Blockzilla/eo.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@
/* Subtitle for Send Anonymous Usage Data toggle on main screen */
"Settings.learnMore" = "Pli da informo.";

/* Lincese option in settings menu. Tapping the cell will take the user to a list of licences for the 3rd parties used in the app. */
"Settings.licenses" = "Permesiloj";

/* Light theme option in settings menu */
"Settings.lightTheme" = "Hela";

Expand Down
8 changes: 4 additions & 4 deletions Blockzilla/si.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"Edit" = "සංස්කරණය";

/* Button label to reload the error page */
"Error.tryAgainButton" = "යළි උත්සාහය";
"Error.tryAgainButton" = "නැවත";

/* Button label used for cancelling to open another app from Focus */
"ExternalAppLink.cancelTitle" = "අවලංගු";
Expand Down Expand Up @@ -383,10 +383,10 @@
"Settings.toggleBlockSocial2" = "සමාජ";

/* Label for toggle on settings screen */
"Settings.toggleFaceID" = "යෙදුම අගුළු ඇරීමට මුහුණු හැඳු.";
"Settings.toggleFaceID" = "යෙදුම අගුළු ඇරීමට මුහුණේ හැඳු.";

/* %@ is the name of the app (Focus / Klar). Description for 'Enable Face ID' displayed under its respective toggle in the settings menu. */
"Settings.toggleFaceIDDescription" = "ඒ.ස.නි. දැනටමත් යෙදුම තුළ විවෘත නම් මුහුණු හැඳු. මගින් %@ අගුළු හැරීමට හැකිය";
"Settings.toggleFaceIDDescription" = "ඒ.ස.නි. දැනටමත් යෙදුම තුළ විවෘත නම් මුහුණේ හැඳු. මගින් %@ අගුළු හැරීමට හැකිය";

/* Show home screen tips toggle label on settings screen */
"Settings.toggleHomeScreenTips" = "මුල් තිර ඉඟි පෙන්වන්න";
Expand Down Expand Up @@ -512,7 +512,7 @@
"Tip.Biometric.Title" = "අඩවියක් විවෘත විට %@ අගුළුලන්න:";

/* Text for a label that indicates the description for biometric Face ID tip. */
"Tip.BiometricFaceId.Description" = "මුහුණු හැඳු. සක්‍රිය කරන්න";
"Tip.BiometricFaceId.Description" = "මුහුණක හැඳු. සක්‍රිය කරන්න";

/* Text for a label that indicates the description for biometric Touch ID tip. */
"Tip.BiometricTouchId.Description" = "ස්පර්ශ හැඳු. සක්‍රිය කරන්න";
Expand Down
3 changes: 3 additions & 0 deletions Blockzilla/sq.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@
/* Subtitle for Send Anonymous Usage Data toggle on main screen */
"Settings.learnMore" = "Mësoni më tepër.";

/* Lincese option in settings menu. Tapping the cell will take the user to a list of licences for the 3rd parties used in the app. */
"Settings.licenses" = "Licenca";

/* Light theme option in settings menu */
"Settings.lightTheme" = "E çelët";

Expand Down
3 changes: 2 additions & 1 deletion ContentBlocker/br.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/* No Strings */
/* Human readable description */
"NSHumanReadableDescription" = "Stankadur endalc’had ha gwarez heuliañ gant Mozilla";

2 changes: 1 addition & 1 deletion Search/SearchPlugins/default/duckduckgo.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>DuckDuckGo</ShortName>
<InputEncoding>UTF-8</InputEncoding>
<Image width="16" height="16">data:image/png;base64,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</Image>
<Image width="16" height="16">data:image/png;base64,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</Image>
<Url type="application/x-suggestions+json" method="GET" template="https://ac.duckduckgo.com/ac/">
<Param name="q" value="{searchTerms}"/>
<Param name="type" value="list"/>
Expand Down
6 changes: 6 additions & 0 deletions Widgets/br.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/* Description for small size widget to add it to home screen. %@ is the name of the app(Focus/Klar). */
"TodayWidget.QuickActionGalleryDescription" = "Ouzhpennit ur verradenn %@ d’ho skramm degemer. Goude bezañ ouzhpennet ar widjed, stokit ha dalc’hit evit kemmañ ha diuzit ur verradenn all.";

/* Description for small size widget to add it to home screen. %@ is the name of the app(Focus/Klar). */
"TodayWidget.QuickActionGalleryDescriptionV2" = "Loc'hañ ur c’hlask prevez e %@ gant ho keflusker enklask dre ziouer.";

/* Quick Actions title when widget enters edit mode */
"TodayWidget.QuickActionsGalleryTitle" = "Oberoù prim";

Expand Down
2 changes: 1 addition & 1 deletion bin/nimbus-fml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ if [ -n "$MOZ_APPSERVICES_LOCAL" ] ; then
export BINARY_PATH="$HOME/.cargo/bin/cargo run --manifest-path $LOCAL_FML_DIR/Cargo.toml --"
else
# Otherwise, we should download a pre-built copy
AS_DOWNLOAD_URL="https://github.com/mozilla/application-services/releases/download/v$AS_VERSION"
AS_DOWNLOAD_URL="https://archive.mozilla.org/pub/app-services/releases/$AS_VERSION"
CHECKSUM_URL="$AS_DOWNLOAD_URL/nimbus-fml.sha256"
FML_URL="$AS_DOWNLOAD_URL/nimbus-fml.zip"
RELEASE_STATUS_CODE=$(curl -L --write-out '%{http_code}' --silent --output /dev/null "$CHECKSUM_URL")
Expand Down

0 comments on commit 02f472f

Please sign in to comment.