From 6ab4d437fc82048372136984a38f66c85fda28aa Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Fri, 11 May 2018 10:58:26 -0400 Subject: [PATCH 1/2] Removing extra tokens from non-English language files. --- _locales/de/messages.json | 23 ----------------------- _locales/es/messages.json | 23 ----------------------- _locales/fr/messages.json | 23 ----------------------- _locales/hu/messages.json | 23 ----------------------- _locales/it/messages.json | 23 ----------------------- _locales/ja/messages.json | 23 ----------------------- _locales/ko/messages.json | 23 ----------------------- _locales/nl/messages.json | 23 ----------------------- _locales/pl/messages.json | 23 ----------------------- _locales/pt_BR/messages.json | 23 ----------------------- _locales/ru/messages.json | 23 ----------------------- _locales/zh_CN/messages.json | 23 ----------------------- _locales/zh_TW/messages.json | 23 ----------------------- 13 files changed, 299 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 1677944aa..6219b0bc7 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery Rewards" }, - "panel_detail_rewards_text": { - "message": "Funktion ist demnächst verfügbar." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1292,26 +1289,6 @@ "setup_login_view_password_error": { "message": "Verwenden Sie zwischen 8 und 50 Zeichen." }, - "setup_login_view_terms_error": { - "message": "Sie müssen dies akzeptieren." - }, - "setup_login_view_terms": { - "message": "Ich erkläre mich mit Ghosterys $LINK_PP_START$Datenschutzrichtlinie$LINK_PP_END$ und $LINK_TERMS_START$Benutzungsbedingungen$LINK_TERMS_END$ einverstanden", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Haben Sie noch kein Benutzerkonto? Erstellen Sie eins." }, diff --git a/_locales/es/messages.json b/_locales/es/messages.json index ab12e4f9f..c1cd736dc 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Recompensas de Ghostery" }, - "panel_detail_rewards_text": { - "message": "Pronto tendrás esta función." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Usa entre 8 y 50 caracteres." }, - "setup_login_view_terms_error": { - "message": "Debes aceptar esto." - }, - "setup_login_view_terms": { - "message": "Acepto la $LINK_PP_START$ política de privacidad $LINK_PP_END$ y las $LINK_TERMS_START$ condiciones de uso $LINK_TERMS_END$ de Ghostery", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "¿No tienes una cuenta? Crea una." }, diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index 5d3fd348f..ab84ba923 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Récompenses Ghostery" }, - "panel_detail_rewards_text": { - "message": "Option bientôt disponible." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Utilisez entre 8 et 50 caractères." }, - "setup_login_view_terms_error": { - "message": "Vous devez accepter ceci avant de pouvoir continuer." - }, - "setup_login_view_terms": { - "message": "J'accepte la $LINK_PP_START$Politique de confidentialité$LINK_PP_END$ et les $LINK_TERMS_START$Conditions d'utilisation$LINK_TERMS_END$ de Ghostery", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Vous n'avez pas de compte ? Créez-en un." }, diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index 5699ad445..70243aac6 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery jutalmak" }, - "panel_detail_rewards_text": { - "message": "Funkció hamarosan érkezik." - }, "panel_detail_premium_title": { "message": "Ghostery Prémium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "8–50 karaktert használjon." }, - "setup_login_view_terms_error": { - "message": "Önnek ezt el kell fogadnia." - }, - "setup_login_view_terms": { - "message": "Egyetértek a Ghostery $LINK_PP_START$Adatvédelmi Szabályzatával$LINK_PP_END$ és $LINK_TERMS_START$Felhasználási Feltételeivel$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Nem rendelkezik fiókkal? Hozzon létre egyet." }, diff --git a/_locales/it/messages.json b/_locales/it/messages.json index 3a08baaf0..03a2c2e8f 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ricompense Ghostery" }, - "panel_detail_rewards_text": { - "message": "Funzionalità presto disponibile." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Utilizza tra 8 e 50 caratteri." }, - "setup_login_view_terms_error": { - "message": "Devi accettarli." - }, - "setup_login_view_terms": { - "message": "Accetto l'$LINK_PP_START$Informativa sulla Privacy$LINK_PP_END$ e i $LINK_TERMS_START$Termini di Utilizzo$LINK_TERMS_END$ di Ghostery.", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Non hai un account? Creane uno." }, diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index 77aa4bf3c..f97d86796 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery報酬" }, - "panel_detail_rewards_text": { - "message": "近日開始する機能です。" - }, "panel_detail_premium_title": { "message": "Ghosteryプレミアム" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "8～50文字を使用してください。" }, - "setup_login_view_terms_error": { - "message": "これを承認する必要があります。" - }, - "setup_login_view_terms": { - "message": "Ghosteryの$LINK_PP_START$プライバシーポリシーPrivacy Policy$LINK_PP_END$と$LINK_TERMS_START$利用規約$LINK_TERMS_END$に同意します", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "アカウントをお持ちでないですか？アカウントを作成してください。" }, diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 244059b51..f7495a9fc 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery 리워드 " }, - "panel_detail_rewards_text": { - "message": "기능이 곧 제공됩니다." - }, "panel_detail_premium_title": { "message": "Ghostery 프리미엄 " }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "8자에서 50자까지 사용할 수 있습니다." }, - "setup_login_view_terms_error": { - "message": "이 항목을 수락해야 합니다. " - }, - "setup_login_view_terms": { - "message": "Ghostery의 $LINK_PP_START$개인정보 보호정책$LINK_PP_END$ 및 $LINK_TERMS_START$사용 약관$LINK_TERMS_END$에 동의합니다 ", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "계정이 있으십니까? 계정 만들기." }, diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 6277417c2..972dfee91 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery Rewards" }, - "panel_detail_rewards_text": { - "message": "Functie binnenkort mogelijk." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Gebruik tussen 8 en 50 karakters." }, - "setup_login_view_terms_error": { - "message": "Je moet dit aanvaarden." - }, - "setup_login_view_terms": { - "message": "Ik aanvaard Ghostery's $LINK_PP_START$Privacybeleid$LINK_PP_END$ en de $LINK_TERMS_START$Gebruikersvoorwaarden$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Heb je geen account? Maak er een aan." }, diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 26a605a86..1a0ba4a6b 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Nagrody Ghostery" }, - "panel_detail_rewards_text": { - "message": "Funkcja dostępna niebawem." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Użyj od 8 do 50 znaków." }, - "setup_login_view_terms_error": { - "message": "Musisz wyrazić na to zgodę." - }, - "setup_login_view_terms": { - "message": "Wyrażam zgodę na obowiązującą w Ghostery $LINK_PP_START$Politykę prywatności$LINK_PP_END$ oraz $LINK_TERMS_START$Warunki użytkowania$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Nie masz konta? Utwórz je." }, diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json index 6b6a14536..2ef756a48 100644 --- a/_locales/pt_BR/messages.json +++ b/_locales/pt_BR/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Recompensas do Ghostery" }, - "panel_detail_rewards_text": { - "message": "Recurso vindo em breve." - }, "panel_detail_premium_title": { "message": "Ghostery Premium" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Use entre 8 e 50 caracteres." }, - "setup_login_view_terms_error": { - "message": "Você precisa aceitar." - }, - "setup_login_view_terms": { - "message": "Concorco com a $LINK_PP_START$Privacy Policy$LINK_PP_END$ and $LINK_TERMS_START$Terms of Use$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Não tem uma conta? Crie uma." }, diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index e55c7e185..56a99676d 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Вознаграждения Ghostery" }, - "panel_detail_rewards_text": { - "message": "Функция скоро появится." - }, "panel_detail_premium_title": { "message": "Премиум Ghostery" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "Используйте от 8 до 50 символов." }, - "setup_login_view_terms_error": { - "message": "Вы должны принять это." - }, - "setup_login_view_terms": { - "message": "Я согласен с $LINK_PP_START$Политикой конфиденциальности$LINK_PP_END$ и $LINK_TERMS_START$Условиями использования$LINK_TERMS_END$ Ghostery", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "Нет учетной записи? Создать." }, diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json index 27d7201c8..a2a61dc84 100644 --- a/_locales/zh_CN/messages.json +++ b/_locales/zh_CN/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery 奖励" }, - "panel_detail_rewards_text": { - "message": "功能即将推出。" - }, "panel_detail_premium_title": { "message": "Ghostery 高级版" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "请使用 8 到 50 个字符。" }, - "setup_login_view_terms_error": { - "message": "您必须选中此复选框。" - }, - "setup_login_view_terms": { - "message": "我同意 Ghostery 的$LINK_PP_START$隐私政策$LINK_PP_END$和$LINK_TERMS_START$使用条款$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "没有帐户？创建一个。" }, diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json index 224274813..73e53e046 100644 --- a/_locales/zh_TW/messages.json +++ b/_locales/zh_TW/messages.json @@ -699,9 +699,6 @@ "panel_detail_rewards_title": { "message": "Ghostery 獎賞" }, - "panel_detail_rewards_text": { - "message": "即將添加的功能" - }, "panel_detail_premium_title": { "message": "Ghostery 高級版" }, @@ -1289,26 +1286,6 @@ "setup_login_view_password_error": { "message": "使用 8 至 50 個字符。" }, - "setup_login_view_terms_error": { - "message": "您必須接受此項。" - }, - "setup_login_view_terms": { - "message": "我同意 Ghostery 的$LINK_PP_START$隱私政策$LINK_PP_END$ 及 $LINK_TERMS_START$使用條款$LINK_TERMS_END$", - "placeholders": { - "link_pp_start": { - "content": "a href=\"https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/\" target=\"_blank\">" - }, - "link_pp_end": { - "content": "" - }, - "link_terms_start": { - "content": "" - }, - "link_terms_end": { - "content": "" - } - } - }, "setup_login_view_create_account": { "message": "沒有帳戶？創建一個。" }, From 246f68efadb5564bb58575547e4c2cc71e399b48 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Fri, 11 May 2018 11:06:00 -0400 Subject: [PATCH 2/2] Removing console.log from OfferCard.jsx (lint complain) --- app/content-scripts/rewards/OfferCard.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/content-scripts/rewards/OfferCard.jsx b/app/content-scripts/rewards/OfferCard.jsx index fe3b2bf88..b081ac73a 100644 --- a/app/content-scripts/rewards/OfferCard.jsx +++ b/app/content-scripts/rewards/OfferCard.jsx @@ -16,7 +16,6 @@ import ReactDOM from 'react-dom'; import { Link } from 'react-router-dom'; import msgModule from '../utils/msg'; import { computeTimeDelta } from '../../panel/utils/utils'; -import { log } from '../../../src/utils/common'; import Notification from './Notification'; import Settings from './Settings'; import ClickOutside from '../../panel/components/BuildingBlocks/ClickOutside'; @@ -111,7 +110,6 @@ class OfferCard extends Component { } sendSignal(actionId, props = this.props) { - console.log('send signal ', actionId); // Cliqz metrics const offerId = props.reward.offer_id; const message = {