Merge branch 'master' into gdpr-username

2026-08-13 12:40:11 +08:00 · 2018-04-30 16:01:58 -04:00
parent 12d48d6248 743327a53b
commit b31b01bc50
18 changed files with 21 additions and 24 deletions
@@ -50,7 +50,6 @@ plugins/*
 !plugins/talk-plugin-notifications-digest-hourly
 !plugins/talk-plugin-offtopic
 !plugins/talk-plugin-permalink
-!plugins/talk-plugin-profile-settings
 !plugins/talk-plugin-profile-data
 !plugins/talk-plugin-remember-sort
 !plugins/talk-plugin-respect
@@ -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)

@@ -33,8 +33,7 @@ By default, Talk has various plugins provided by default. We can see this in `pl
    "talk-plugin-sort-most-respected",
    "talk-plugin-sort-newest",
    "talk-plugin-sort-oldest",
-    "talk-plugin-viewing-options",
-    "talk-plugin-profile-settings"
+    "talk-plugin-viewing-options"
  ]
 }
 ```
@@ -65,10 +65,6 @@ First, you'll enable `talk-plugin-author-menu`, as this houses the Ignore button

 And then we will enable the Ignore User plugin: `talk-plugin-ignore-user`. 

-And finally, we will need to enable Profile Settings; this is the tab on My Profile > Settings where commenters can manage their Ignored Users list.
-
-`talk-plugin-profile-settings`
-
 ### Featured Comments

 To enable the featuring of comments, you'll need to activate `talk-plugin-featured-comments`. If you would like the Featured Comments tab to be the default tab you land on for the stream, you will need to set the default tab ENV variable:
@@ -36,10 +36,6 @@ Adding the `talk-plugin-notifications` plugin will also enable the `notification

 See https://github.com/coralproject/talk/blob/8b669a31c551a042f0f079d8cfc16825673eb8f0/plugins/talk-plugin-notifications-reply/index.js for an example.

-### Commenter Notification Settings
-
-Note that notifications REQUIRE the `talk-plugin-profile-settings` plugin; this is where on My Profile commenters will enable and manage their notification settings.
-
 ### Notification Categories

 Talk currently supports the following Notifications options out of the box:
@@ -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"
@@ -218,6 +218,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"
    password_change:
      subject: "{0} password change"
      body: "The password on your account has been changed.\n\nIf you did not request this change, please contact us at {0}."
@@ -215,6 +215,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:
@@ -103,8 +103,7 @@ class SignUp extends React.Component {
              />
              {passwordError && (
                <span className={styles.hint}>
-                  {' '}
-                  Password must be at least 8 characters.{' '}
+                  {t('talk-plugin-auth.login.password_error')}
                </span>
              )}
              <TextField
@@ -60,6 +60,7 @@ da:
      or: "Or"
      email: "Email Address"
      password: "Password"
+      password_error: "Password must be at least 8 characters."
      forgot_your_pass: "Forgot your password?"
      need_an_account: "Need an account?"
      register: "Register"
@@ -103,6 +104,7 @@ en:
      or: "Or"
      email: "Email Address"
      password: "Password"
+      password_error: "Password must be at least 8 characters."
      forgot_your_pass: "Forgot your password?"
      need_an_account: "Need an account?"
      register: "Register"
@@ -213,6 +215,7 @@ es:
      or: "O"
      email: "Dirección de Correo"
      password: "Contraseña"
+      password_error: "La contraseña debe tener al menos 8 caracteres."
      forgot_your_pass: "¿Has olvidado tu contraseña?"
      need_an_account: "¿Necesitas una cuenta?"
      register: "Registrar"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,6 @@
 en:
  talk-plugin-sort-most-upvoted:
    label: Most upvoted first
+es:
+  talk-plugin-sort-oldest:
+    label: Más votadas primero
@@ -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
@@ -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
@@ -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"
@@ -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,
      });
    }