Skip to content

Commit

Permalink
129.0b9
Browse files Browse the repository at this point in the history
  • Loading branch information
bot committed Aug 1, 2024
1 parent f95a49c commit 76a52ed
Show file tree
Hide file tree
Showing 52 changed files with 781 additions and 380 deletions.
35 changes: 27 additions & 8 deletions firefox-src-part/browser/components/search/SearchSERPTelemetry.sys.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1953,6 +1953,7 @@ class SERPCategorizer {
// downloading the data), we shouldn't report telemetry.
// Thus, there is no point attempting to categorize the SERP.
if (SearchSERPDomainToCategoriesMap.empty) {
SERPCategorizationRecorder.recordMissingImpressionTelemetry();
return null;
}
let resultsToReport = {};
Expand Down Expand Up @@ -2281,16 +2282,23 @@ class CategorizationRecorder {
);
Glean.serp.categorization.record(resultToReport);

this.#serpCategorizationsCount++;
if (
this.#serpCategorizationsCount >=
CATEGORIZATION_SETTINGS.PING_SUBMISSION_THRESHOLD
) {
this.submitPing("threshold_reached");
}
this.#incrementCategorizationsCount();
}

/**
* Helper function for recording Glean telemetry when issues with the
* domain-to-categories map cause the categorization and impression not to be
* recorded.
*/
recordMissingImpressionTelemetry() {
lazy.logConsole.debug(
"Recording a missing impression due to an issue with the domain-to-categories map."
);
Glean.serp.categorizationNoMapFound.add();
this.#incrementCategorizationsCount();
}

/*
/**
* Adds a Glean object metric to the custom SERP categorization ping if info
* about a single experiment has been requested via Nimbus config.
*/
Expand Down Expand Up @@ -2354,6 +2362,17 @@ class CategorizationRecorder {
}
}

#incrementCategorizationsCount() {
this.#serpCategorizationsCount++;

if (
this.#serpCategorizationsCount >=
CATEGORIZATION_SETTINGS.PING_SUBMISSION_THRESHOLD
) {
this.submitPing("threshold_reached");
}
}

#resetCategorizationRecorderData() {
this.#serpCategorizationsCount = 0;
this.#userInteractionStartTime = null;
Expand Down
25 changes: 18 additions & 7 deletions firefox-src-part/browser/components/urlbar/UrlbarInput.sys.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3853,14 +3853,25 @@ export class UrlbarInput {
this.setPageProxyState("invalid", true);
}

if (!this.view.isOpen) {
this.view.clear();
} else if (!value && !lazy.UrlbarPrefs.get("suggest.topsites")) {
this.view.clear();
if (!this.searchMode || !this.view.oneOffSearchButtons.hasView) {
this.view.close();
return;
if (this.view.isOpen) {
if (lazy.UrlbarPrefs.get("closeOtherPanelsOnOpen")) {
// UrlbarView rolls up all popups when it opens, but we should
// do the same for UrlbarInput when it's already open in case
// a tab preview was opened
this.window.docShell.treeOwner
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIAppWindow)
.rollupAllPopups();
}
if (!value && !lazy.UrlbarPrefs.get("suggest.topsites")) {
this.view.clear();
if (!this.searchMode || !this.view.oneOffSearchButtons.hasView) {
this.view.close();
return;
}
}
} else {
this.view.clear();
}

this.view.removeAccessibleFocus();
Expand Down
6 changes: 3 additions & 3 deletions ...d/android-components/components/browser/engine-system/src/main/res/values-dsb/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<!-- Text for the title of an alert dialog displayed by a web page. %1$s will be replaced with the URL of the current page (displaying the dialog). -->
<string name="mozac_browser_engine_system_alert_title">Bok na %1$s groni:</string>
<!-- Text for the message of an auth dialog displayed by a web page.
%1$s will be replaced by the realm, %2$s will be replaced with the URL of the current page (displaying the dialog). -->
<string name="mozac_browser_engine_system_auth_message">%2$s pomina wužywarske mě a gronidło. Sedło groni: &quot;%1$s&quot;</string>
%1$s will be replaced by the hostname or a description of the protected area/site, %2$s will be replaced with the URL of the current page (displaying the dialog). -->
<string name="mozac_browser_engine_system_auth_message">%2$s pomina wužywaŕske mě a gronidło. Sedło groni: &quot;%1$s&quot;</string>
<!-- Text for the message of an auth dialog displayed by a web page. %1$s will be replaced with the URL of the current page (displaying the dialog). -->
<string name="mozac_browser_engine_system_auth_no_realm_message">%1$s pomina wašo wužywarske mě a gronidło.</string>
<string name="mozac_browser_engine_system_auth_no_realm_message">%1$s pomina wašo wužywaŕske mě a gronidło.</string>
</resources>
4 changes: 2 additions & 2 deletions ...roid/android-components/components/browser/errorpages/src/main/res/values-dsb/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<!-- The error message shown when the browser gets stuck in an infinite loop when loading a website. -->
<string name="mozac_browser_errorpages_redirect_loop_message"><![CDATA[<p>Wobglědowak jo pśestał, pominany objekt wótwołowaś. Sedło pósrědnja napšašowanje na nałog, kótaryž se njekóńcy.</p>
<ul>
<li>Sćo cookieje znjemóžnił abo zablokěrował, kótarež su trěbne za tós to sedło?</li>
<li>Sćo cookieje znjemóžnił abo zablokěrował, kótarež su trjebne za tós to sedło?</li>
<li>Jolic akceptěrowanje sedłowych cookiejow njerozwězujo ten problem, jo to nejskerjej problem serwereje konfiguracije a nic wašogo rěda.</li>
</ul>]]></string>

Expand Down Expand Up @@ -222,7 +222,7 @@
<string name="mozac_browser_errorpages_unknown_protocol_message"><![CDATA[
<p>Adresa pódawa protokol (na pś. <q>wxyz://</q>), kótaryž wobglědowak njepśipóznawa, tak až wobglědowak njamóžo pšawje ze sedłom zwězaś.</p>
<ul>
<li>Wopytujośo na multimedia abo druge njetekstowe słužby pśistup maś? Pśespytajśo sedło za wósebnymi pótrěbnosćami.</li>
<li>Wopytujośo na multimedia abo druge njetekstowe słužby pśistup maś? Pśespytajśo sedło za wósebnymi pótrjebnosćami.</li>
<li>Někotare protokole trjebaju programy tśeśich abo tykace, nježli až wobglědowak móžo je pśipóznaś.</li>
</ul>
]]></string>
Expand Down
6 changes: 0 additions & 6 deletions ...ile/android/android-components/components/browser/menu/src/main/res/values-gl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,12 @@
<string name="mozac_browser_menu_button">Menú</string>
<!-- Content description (not visible, for screen readers etc.): Indicates the overflow menu has a highlight -->
<string name="mozac_browser_menu_highlighted">Realzado</string>
<!-- Label for add-ons submenu section -->
<string name="mozac_browser_menu_addons" moz:removedIn="126" tools:ignore="UnusedResources">Complementos</string>
<!-- Label for extensions submenu section -->
<string name="mozac_browser_menu_extensions">Extensións</string>
<!-- Label for add-ons sub menu item for add-ons manager -->
<string name="mozac_browser_menu_addons_manager" moz:removedIn="126" tools:ignore="UnusedResources">Xestor de complementos</string>
<!-- Label for extensions sub menu item for extensions manager -->
<string name="mozac_browser_menu_extensions_manager">Xestor de extensións</string>
<!-- Content description for the action bar "up" button -->
<string name="action_bar_up_description">Navegar cara arriba</string>
<!-- Content description for the action bar "up" button of the add-ons sub menu item -->
<string name="mozac_browser_menu_addons_description" moz:removedIn="126" tools:ignore="UnusedResources">Complementos, navegar cara arriba</string>
<!-- Content description for the action bar "up" button of the extensions sub menu item -->
<string name="mozac_browser_menu_extensions_content_description">Extensións, navega cara arriba</string>
</resources>
6 changes: 3 additions & 3 deletions .../android/android-components/components/feature/addons/src/main/res/values-dsb/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<!-- This is the title of a dialog that asks the users to grant optional permissions. %1$s is the add-on name. -->
<string name="mozac_feature_addons_optional_permissions_dialog_title">%1$s wó pśidatne pšawa pšosy.</string>
<!-- This is the subtitle of a dialog that asks the users if they want to install or not an add-on, the subtitle lists the permissions that this add-on requires, the permissions will dynamically be listed after the ":". -->
<string name="mozac_feature_addons_permissions_dialog_subtitle">Waša dowólnosć jo trěbna za:</string>
<string name="mozac_feature_addons_permissions_dialog_subtitle">Waša dowólnosć jo trjebna za:</string>
<!-- This is the subtitle of a dialog that asks the users to grant optional permissions, the subtitle lists the permissions that this add-on requests, the permissions will dynamically be listed after the ":". -->
<string name="mozac_feature_addons_optional_permissions_dialog_subtitle">Póžedane pšawa:</string>
<!-- This is a button to add (install) an add-on . -->
Expand Down Expand Up @@ -159,9 +159,9 @@
<!-- The tile of the notification, this will be shown to the user when an add-on needs new permissions, to be updated. %1$s is the name of the add-ons-->
<string name="mozac_feature_addons_updater_notification_title">%1$s ma nowu aktualizaciju</string>
<!-- The content of the notification, this will be shown when an add-on needs new permissions, to be updated. %1$d is the amount of new permissions-->
<string name="mozac_feature_addons_updater_notification_content" tools:ignore="PluralsCandidate">Licba nowych trěbnych pšawow: %1$d</string>
<string name="mozac_feature_addons_updater_notification_content" tools:ignore="PluralsCandidate">Licba nowych trjebnych pšawow: %1$d</string>
<!-- The content of the notification displayed when an add-on needs a new permission-->
<string name="mozac_feature_addons_updater_notification_content_singular">Nowe pšawo jo trěbne</string>
<string name="mozac_feature_addons_updater_notification_content_singular">Nowe pšawo jo trjebne</string>
<!-- Name of the "notification channel" used for displaying a notification for updating an extension. See https://developer.android.com/training/notify-user/channels -->
<string name="mozac_feature_addons_updater_notification_channel_2">Aktualizacije rozšyrjenjow</string>
<!-- Name of the "notification channel" used for displaying a notification for new supported add-ons. See https://developer.android.com/training/notify-user/channels -->
Expand Down
4 changes: 2 additions & 2 deletions ...e/android/android-components/components/feature/addons/src/main/res/values-gl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<!-- This is the caption for the extension installation progress overlay -->
<string name="mozac_extension_install_progress_caption">Descargando e verificando a extensión…</string>
<!-- Error shown when something unexpected happened while trying to get the extension list from the server -->
<string name="mozac_feature_addons_failed_to_query_extensions">Produciuse un erro ao consultar as extensións.</string>
<string name="mozac_feature_addons_failed_to_query_extensions">Produciuse un erro ao consultar as extensións!</string>
<!-- Error shown when unable to find a translation for an add-on field. %1$s is the locale of the user and %2$s is the default language of the add-on -->
<string name="mozac_feature_addons_failed_to_translate">Non se atopou a tradución para a configuración rexional %1$s nin o idioma predeterminado %2$s</string>
<!-- Text shown after successfully installed an add-on. %1$s is the add-on name. -->
Expand All @@ -201,7 +201,7 @@
<!-- Text shown when attempting to install a blocklisted add-on. %1$s is the add-on name. -->
<string name="mozac_feature_addons_blocklisted_1">Non se puido instalar %1$s porque ten un alto risco de causar problemas de estabilidade ou seguridade.</string>
<!-- Text shown when attempting to install an add-on that can only be install via Enterprise Policies, which is not supported on Android. %1$s is the add-on name. -->
<string name="mozac_feature_addons_admin_install_only">Non se puido instalar %1$s porque só o pode instalar unha organización que utilice políticas empresariais, que non se admiten nesta plataforma.</string>
<string name="mozac_feature_addons_admin_install_only">Non se puido instalar %1$s porque só a pode instalar unha organización que utilice políticas empresariais, que non se admiten nesta plataforma.</string>
<!-- Text shown after successfully enabled an add-on. %1$s is the add-on name. -->
<string name="mozac_feature_addons_successfully_enabled">Activouse %1$s correctamente</string>
<!-- Text shown after failed to enable an add-on. %1$s is the add-on name. -->
Expand Down
Loading

0 comments on commit 76a52ed

Please sign in to comment.