Tried to DRY the user_blocks controller. Moved the configuration of the blocking...

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bfa728c1e26ed70bfe4adedcaf40b296989dd4d6..363f620f4c6f4a63f93135b0e7e5846ef5d1d32b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1009,8 +1009,11 @@ en:
       confirm: "Confirm"
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
   user_block:
       confirm: "Confirm"
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
   user_block:

+    model:
+      non_moderator_update: "Must be a moderator to create or update a block."
+      non_moderator_revoke: "Must be a moderator to revoke a block."

     new:
     new:

-      reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
+      reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."

       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."
       period: "How long, starting now, the user will be blocked from the API for."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."


@@ -1025,15 +1028,16 @@ en:
       back: "Back"
       title: "Editing block on {{name}}"
       needs_view: "Does the user need to log in before this block will be cleared?"
       back: "Back"
       title: "Editing block on {{name}}"
       needs_view: "Does the user need to log in before this block will be cleared?"

+    filter:
+      not_a_moderator: "You need to be a moderator to perform that action."
+      block_expired: "The block has already expired and cannot be edited."
+      block_period: "The blocking period must be one of the values selectable in the drop-down list."

     create:
     create:

-      not_a_moderator: "User block could not be created: you are not a moderator."

       try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
       try_waiting: "Please try giving the user a reasonable time to respond before blocking them."
       try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
       try_waiting: "Please try giving the user a reasonable time to respond before blocking them."

-      bad_parameters: "Could not create a new block due to bad parameters. Maybe the blocking period is not valid?"

       flash: "Created a block on user {{name}}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       flash: "Created a block on user {{name}}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."

-      block_expired: "The block has already expired and cannot be edited."

       success: "Block updated."
     index:
       heading: "Listing User Blocks"
       success: "Block updated."
     index:
       heading: "Listing User Blocks"