From a019857f650831939f5ddc7e90d4643ff0e13076 Mon Sep 17 00:00:00 2001
From: piero
Date: Thu, 18 Apr 2024 11:35:08 +0200
Subject: [PATCH] Fix fr string
---
Extension/_locales/fr/messages.json | 2 +-
package.json | 2 +-
tools/bundle.js | 8 ++++----
tools/bundle/firefox/manifest.firefox.js | 4 ++--
tools/bundle/module-replacements.js | 2 +-
tools/bundle/webpack-config.js | 2 +-
tools/constants.js | 10 +++++-----
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Extension/_locales/fr/messages.json b/Extension/_locales/fr/messages.json
index 4eb2fa7..4ea2049 100644
--- a/Extension/_locales/fr/messages.json
+++ b/Extension/_locales/fr/messages.json
@@ -1,6 +1,6 @@
{
"name": {
- "message": "Qwant - The search engine that doesn't know anything about you"
+ "message": "Qwant - Le moteur de recherche qui ne sait rien sur vous"
},
"short_name": {
"message": "Qwant"
diff --git a/package.json b/package.json
index 1cf19dd..960874d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "qwant-search-extension",
- "version": "7.0.0",
+ "version": "7.0.3",
"description": "Qwant Search Extension",
"author": "extensions@qwant.com",
"license": "GPL-3.0",
diff --git a/tools/bundle.js b/tools/bundle.js
index 8fd490b..ef51be2 100644
--- a/tools/bundle.js
+++ b/tools/bundle.js
@@ -9,8 +9,8 @@ const bundleChrome = (watch) => {
return bundleRunner(webpackConfig, watch);
};
-const bundleFirefoxAmo = (watch) => {
- const webpackConfig = getWebpackConfig(BROWSERS.FIREFOX_AMO);
+const bundleFirefox = (watch) => {
+ const webpackConfig = getWebpackConfig(BROWSERS.FIREFOX);
return bundleRunner(webpackConfig, watch);
};
@@ -26,7 +26,7 @@ const bundleOpera = () => {
const plan = [
bundleChrome,
- bundleFirefoxAmo,
+ bundleFirefox,
bundleEdge,
bundleOpera,
];
@@ -57,7 +57,7 @@ const chrome = async (watch) => {
const firefox = async (watch) => {
try {
- await bundleFirefoxAmo(watch);
+ await bundleFirefox(watch);
} catch (e) {
console.error(e);
process.exit(1);
diff --git a/tools/bundle/firefox/manifest.firefox.js b/tools/bundle/firefox/manifest.firefox.js
index d223e63..9eb99af 100644
--- a/tools/bundle/firefox/manifest.firefox.js
+++ b/tools/bundle/firefox/manifest.firefox.js
@@ -2,7 +2,7 @@ import { APP_ID_FIREFOX } from '../../constants';
export const firefoxManifest = {
manifest_version: 2,
- applications: {
+ browser_specific_settings: {
gecko: {
id: APP_ID_FIREFOX,
strict_min_version: '78.0',
@@ -11,7 +11,7 @@ export const firefoxManifest = {
chrome_settings_overrides: {
search_provider: {
name: 'Qwant',
- keyword: 'www.qwant.com',
+ keyword: 'qwant.com',
search_url: 'https://www.qwant.com/?q={searchTerms}&client=ext-firefox-sb',
favicon_url: 'https://www.qwant.com/favicon.ico',
suggest_url: 'https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch',
diff --git a/tools/bundle/module-replacements.js b/tools/bundle/module-replacements.js
index a94e888..9b995f9 100644
--- a/tools/bundle/module-replacements.js
+++ b/tools/bundle/module-replacements.js
@@ -26,7 +26,7 @@ export const getModuleReplacements = (browserConfig) => {
const browserModuleReplacement = new NormalModuleReplacementPlugin(browsersRegexp, (resource) => {
const from = resource.request;
if (browserConfig.browser === BROWSERS.FIREFOX_STANDALONE
- || browserConfig.browser === BROWSERS.FIREFOX_AMO) {
+ || browserConfig.browser === BROWSERS.FIREFOX) {
resource.request = resource.request.replace(browsersRegexp, '$1firefox$2');
} else {
resource.request = resource.request.replace(browsersRegexp, '$1chrome$2');
diff --git a/tools/bundle/webpack-config.js b/tools/bundle/webpack-config.js
index 490d749..bafe794 100644
--- a/tools/bundle/webpack-config.js
+++ b/tools/bundle/webpack-config.js
@@ -12,7 +12,7 @@ export const getWebpackConfig = (browser) => {
case BROWSERS.CHROME: {
return genChromeConfig(browserConf);
}
- case BROWSERS.FIREFOX_AMO: {
+ case BROWSERS.FIREFOX: {
return genFirefoxConfig(browserConf);
}
case BROWSERS.OPERA: {
diff --git a/tools/constants.js b/tools/constants.js
index 5abde87..790921f 100644
--- a/tools/constants.js
+++ b/tools/constants.js
@@ -1,11 +1,11 @@
/* eslint-disable max-len */
import path from 'path';
-export const APP_ID_FIREFOX = 'qwant-search-ff@qwant.com';
+export const APP_ID_FIREFOX = 'qwant-search-firefox@qwant.com';
export const BROWSERS = {
CHROME: 'chrome',
- FIREFOX_AMO: 'firefox-amo',
+ FIREFOX: 'firefox',
OPERA: 'opera',
EDGE: 'edge',
};
@@ -15,9 +15,9 @@ export const BROWSERS_CONF = {
browser: BROWSERS.CHROME,
buildDir: BROWSERS.CHROME,
},
- [BROWSERS.FIREFOX_AMO]: {
- browser: BROWSERS.FIREFOX_AMO,
- buildDir: BROWSERS.FIREFOX_AMO,
+ [BROWSERS.FIREFOX]: {
+ browser: BROWSERS.FIREFOX,
+ buildDir: BROWSERS.FIREFOX,
},
[BROWSERS.OPERA]: {
browser: BROWSERS.OPERA,