From 26d909e58f6a4d4cb6a41c9a5bc03888bcb93f47 Mon Sep 17 00:00:00 2001
From: Carl Chenet <chaica@ohmytux.com>
Date: Thu, 10 Nov 2016 12:10:21 +0100
Subject: [PATCH] i18n of stories/edit

---
 app/views/stories/edit.html.erb | 19 ++++++++-----------
 config/locales/en.yml           | 10 ++++++++++
 config/locales/fr.yml           | 10 ++++++++++
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/views/stories/edit.html.erb b/app/views/stories/edit.html.erb
index b197af6..0a1c35b 100644
--- a/app/views/stories/edit.html.erb
+++ b/app/views/stories/edit.html.erb
@@ -1,6 +1,6 @@
 <div class="box" id="story_box">
   <div class="legend">
-    Edit Story
+    <%= t('.edit') %>
   </div>
 
   <%= form_for @story, :url => story_path(@story.short_id),
@@ -12,22 +12,20 @@
       <br />
       <div class="box">
         <div class="boxline">
-          <%= f.label :merge_story_short_id, "Merge Into:",
+          <%= f.label :merge_story_short_id, t('.merge'),
             :class => "required" %>
           <%= f.text_field :merge_story_short_id, :autocomplete => "off",
-            :placeholder => "Short id of story into which this story " <<
-            "be merged" %>
+            :placeholder => t('.shortid') %>
         </div>
         <div class="boxline">
-          <%= f.label :unavailable_at, "Unavailable:",
+          <%= f.label :unavailable_at, t('.unavailable'),
             :class => "required" %>
           <%= f.check_box :is_unavailable %>
-          <%= f.label :unavailable_at, "Source URL is unavailable, " <<
-            "enable display of cached text", :class => "normal" %>
+          <%= f.label :unavailable_at, t('.unavailableat'), :class => "normal" %>
         </div>
         <% if @story.user_id != @user.id %>
           <div class="boxline">
-            <%= f.label :moderation_reason, "Mod Reason:",
+            <%= f.label :moderation_reason, t('.modreason'),
               :class => "required" %>
             <%= f.text_field :moderation_reason, :autocomplete => "off" %>
           </div>
@@ -43,9 +41,8 @@
           Markdown formatting available
         </div>
 
-        <%= submit_tag "Save" %>
-        &nbsp;or <a href="<%= story_path(@story.short_id) %>">cancel
-          editing</a>
+        <%= submit_tag t('.save') %>
+        &nbsp;or <a href="<%= story_path(@story.short_id) %>"><%= t('.cancel') %></a>
 
         <div style="clear: both;"></div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8dbff98..4264ac8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -157,6 +157,16 @@ en:
       memouser: "Memo to User:"
       sendinvitation: "Send Invitation"
   stories:
+    edit:
+      edit: "Edit Story"
+      merge: "Merge Into:"
+      shortid: "Short id of story into which this story be merged"
+      unavailable: "Unavailable:"
+      unavailableat: "Source URL is unavailable, enable display of cached text"
+      modreason: "Mod Reason:"
+      markdown: "Markdown formatting available"
+      save: "Save"
+      cancel: "cancel editing"
     form:
       alreadysubmitted: "Error: This story was already submitted "
       alreadysubmittedflash: "Note: This story was already submitted %{timeago} but may be submitted again."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4d68b8a..48697f0 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -169,6 +169,16 @@ fr:
       memouser: "Message à l'utilisateur :"
       sendinvitation: "Envoyer l'invitation"
   stories:
+    edit:
+      edit: "Éditer l'info"
+      merge: "Fusionner :"
+      shortid: "ID courte de l'info dans laquelle cette info sera fusionnée"
+      unavailable: "Non dispo :"
+      unavailableat: "URL source non disponible, active l'affichage du texte en cache"
+      modreason: "Raison de la modération :"
+      markdown: "Utilisation du Markdown possible"
+      save: "Sauver"
+      cancel: "Annuler l'édition"
     form:
       alreadysubmitted: "Erreur : Cette info a déjà été proposée "
       alreadysubmittedflash: "Note: Cette info a déjà été proposée %{timeago} mais peut être de nouveau reproposée."