From 8643b1fbf2b49dcc93b2307451c8e93a23b94375 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 26 Apr 2018 17:52:03 +0200 Subject: [PATCH 1/5] Decrease font-size and padding in Flag Comment popup a bit. --- client/coral-embed-stream/style/default.css | 4 ++-- client/coral-ui/components/PopupMenu.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 98416d68d..b9330ba62 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -177,8 +177,8 @@ button.comment__action-button[disabled], } .talk-plugin-flags-popup-header { - font-weight: bolder; - font-size: 1.33rem; + font-weight: bold; + font-size: 1rem; margin-bottom: 10px; } diff --git a/client/coral-ui/components/PopupMenu.css b/client/coral-ui/components/PopupMenu.css index 35544fbad..e6a084736 100644 --- a/client/coral-ui/components/PopupMenu.css +++ b/client/coral-ui/components/PopupMenu.css @@ -9,7 +9,7 @@ box-sizing: border-box; background: white; border-radius: 3px; - padding: 20px 10px; + padding: 10px 10px; z-index: 300; right: 1%; } From 878cbb9195c834df5c93bc4cbf8e61f4a46f5792 Mon Sep 17 00:00:00 2001 From: Jero Date: Thu, 26 Apr 2018 18:35:45 -0300 Subject: [PATCH 2/5] Added email.password_reset.subject translation --- locales/en.yml | 1 + locales/es.yml | 1 + routes/api/v1/account.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index 4a832648c..e175aba05 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -208,6 +208,7 @@ en: we_received_a_request: "We received a request to reset your password. If you did not request this change, you can ignore this email." if_you_did: "If you did," please_click: "please click here to reset password" + subject: "Password reset" embedlink: copy: "Copy to Clipboard" error: diff --git a/locales/es.yml b/locales/es.yml index dd85b588e..18d0b23ea 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -207,6 +207,7 @@ es: we_received_a_request: "Recibimos un pedido para resetear su contraseña. Si no ha pedido ese cambio, por favor ignorar el correo. " if_you_did: "Si lo hizo," please_click: "por favor cliquea aqui para resetear la contraseña." + subject: "Recuperar contraseña" embedlink: copy: "Copiar al portapapeles" error: diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js index 561134885..33d1ec5d2 100644 --- a/routes/api/v1/account.js +++ b/routes/api/v1/account.js @@ -88,7 +88,7 @@ router.post('/password/reset', async (req, res, next) => { locals: { token, }, - subject: 'Password Reset', + subject: res.locals.t('email.password_reset.subject'), email, }); } From 885f186e395f889f4bb7bf2ed0d1b3610524e544 Mon Sep 17 00:00:00 2001 From: Jero Date: Thu, 26 Apr 2018 19:19:06 -0300 Subject: [PATCH 3/5] added viewing and sorting spanish translations --- plugins/talk-plugin-sort-most-liked/client/translations.yml | 2 +- plugins/talk-plugin-sort-most-loved/client/translations.yml | 2 +- plugins/talk-plugin-sort-most-replied/client/translations.yml | 2 +- .../talk-plugin-sort-most-respected/client/translations.yml | 2 +- plugins/talk-plugin-sort-most-upvoted/client/translations.yml | 3 +++ plugins/talk-plugin-sort-newest/client/translations.yml | 2 +- plugins/talk-plugin-sort-oldest/client/translations.yml | 2 +- plugins/talk-plugin-viewing-options/client/translations.yml | 4 ++-- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/plugins/talk-plugin-sort-most-liked/client/translations.yml b/plugins/talk-plugin-sort-most-liked/client/translations.yml index 963561cfd..710519f50 100644 --- a/plugins/talk-plugin-sort-most-liked/client/translations.yml +++ b/plugins/talk-plugin-sort-most-liked/client/translations.yml @@ -12,7 +12,7 @@ de: label: Beliebteste zuerst es: talk-plugin-sort-most-liked: - label: Most liked first + label: Más valoradas primero fr: talk-plugin-sort-most-liked: label: Most liked first diff --git a/plugins/talk-plugin-sort-most-loved/client/translations.yml b/plugins/talk-plugin-sort-most-loved/client/translations.yml index dfb24ff44..f9bf60d18 100644 --- a/plugins/talk-plugin-sort-most-loved/client/translations.yml +++ b/plugins/talk-plugin-sort-most-loved/client/translations.yml @@ -12,7 +12,7 @@ de: label: Häufigste "Ich liebe es" zuerst es: talk-plugin-sort-most-loved: - label: Most loved first + label: Más amadas primero fr: talk-plugin-sort-most-loved: label: Most loved first diff --git a/plugins/talk-plugin-sort-most-replied/client/translations.yml b/plugins/talk-plugin-sort-most-replied/client/translations.yml index 1325d9dd1..2249a5437 100644 --- a/plugins/talk-plugin-sort-most-replied/client/translations.yml +++ b/plugins/talk-plugin-sort-most-replied/client/translations.yml @@ -12,7 +12,7 @@ de: label: Häufigste Antworten zuerst es: talk-plugin-sort-most-replied: - label: Most replied first + label: Más respondidas primero fr: talk-plugin-sort-most-replied: label: Most replied first diff --git a/plugins/talk-plugin-sort-most-respected/client/translations.yml b/plugins/talk-plugin-sort-most-respected/client/translations.yml index 782145237..5ebf85b90 100644 --- a/plugins/talk-plugin-sort-most-respected/client/translations.yml +++ b/plugins/talk-plugin-sort-most-respected/client/translations.yml @@ -12,7 +12,7 @@ de: label: Häufigste "Respektiert" zuerst es: talk-plugin-sort-most-respected: - label: Most respected first + label: Más respetadas primero fr: talk-plugin-sort-most-respected: label: Most respected first diff --git a/plugins/talk-plugin-sort-most-upvoted/client/translations.yml b/plugins/talk-plugin-sort-most-upvoted/client/translations.yml index 7b3c7c29f..6a673a767 100644 --- a/plugins/talk-plugin-sort-most-upvoted/client/translations.yml +++ b/plugins/talk-plugin-sort-most-upvoted/client/translations.yml @@ -1,3 +1,6 @@ en: talk-plugin-sort-most-upvoted: label: Most upvoted first +es: + talk-plugin-sort-oldest: + label: Más votadas primero diff --git a/plugins/talk-plugin-sort-newest/client/translations.yml b/plugins/talk-plugin-sort-newest/client/translations.yml index 294a1a070..663088395 100644 --- a/plugins/talk-plugin-sort-newest/client/translations.yml +++ b/plugins/talk-plugin-sort-newest/client/translations.yml @@ -12,7 +12,7 @@ de: label: Neueste zuerst es: talk-plugin-sort-newest: - label: Newest first + label: Más nuevas primero fr: talk-plugin-sort-newest: label: Newest first diff --git a/plugins/talk-plugin-sort-oldest/client/translations.yml b/plugins/talk-plugin-sort-oldest/client/translations.yml index 7a6cd6e96..5dfe656a1 100644 --- a/plugins/talk-plugin-sort-oldest/client/translations.yml +++ b/plugins/talk-plugin-sort-oldest/client/translations.yml @@ -12,7 +12,7 @@ de: label: Älteste zuerst es: talk-plugin-sort-oldest: - label: Oldest first + label: Más viejas primero fr: talk-plugin-sort-oldest: label: Oldest first diff --git a/plugins/talk-plugin-viewing-options/client/translations.yml b/plugins/talk-plugin-viewing-options/client/translations.yml index 9586263e0..e3516ad7f 100644 --- a/plugins/talk-plugin-viewing-options/client/translations.yml +++ b/plugins/talk-plugin-viewing-options/client/translations.yml @@ -21,8 +21,8 @@ de: es: talk-plugin-viewing-options: viewing_options: "Opciones de visualización" - sort: Sorting - filter: Filtering + sort: Ordenado por + filter: Filtrado por fr: talk-plugin-viewing-options: viewing_options: "Viewing Options" From f42e9dab4c3b634b0b8769b6430b6c6f9817f352 Mon Sep 17 00:00:00 2001 From: Elias Ojala Date: Sat, 28 Apr 2018 12:27:15 +0300 Subject: [PATCH 4/5] nightwatchjs.org doesn't support HTTPS --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6bdb7fda0..b0bc6e497 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You’ve installed Talk on your server, and you’re preparing to launch it on y ## End-to-End Testing -Talk uses [Nightwatch](https://nightwatchjs.org/) as our e2e testing framework. The testing infrastructure that allows us to run our tests in real browsers is provided with love by our friends at [Browserstack](https://browserstack.com). +Talk uses [Nightwatch](http://nightwatchjs.org/) as our e2e testing framework. The testing infrastructure that allows us to run our tests in real browsers is provided with love by our friends at [Browserstack](https://browserstack.com). [![Browserstack](/public/img/browserstack_logo.png)](https://browserstack.com) From edbd21f25f293e40675e0e834248520479a2e490 Mon Sep 17 00:00:00 2001 From: Elias Ojala Date: Sat, 28 Apr 2018 23:02:29 +0300 Subject: [PATCH 5/5] fixed typo --- locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index d7ad006cb..1401664fa 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -164,7 +164,7 @@ en: tech_settings: "Tech Settings" organization_information: "Organization information" organization_info_copy: "We use this information in email notifications generated by Talk. This connects the messages to your organization, and provides a way for users to contact you if they have an issue with their account." - organization_info_copy_2: "We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpuse. This means it can remain consistent over time, and doesn't expose a name that users could target if their account were blocked." + organization_info_copy_2: "We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpose. This means it can remain consistent over time, and doesn't expose a name that users could target if their account were blocked." organization_details: "Organization Details" organization_name: "Organization Name" organization_contact_email: "Organization Contact Email"