diff --git a/app/views/global/_markdownhelp.html.erb b/app/views/global/_markdownhelp.html.erb
index 2e9dd05..6338476 100644
--- a/app/views/global/_markdownhelp.html.erb
+++ b/app/views/global/_markdownhelp.html.erb
@@ -1,12 +1,12 @@
- emphasized text |
- surround text with *asterisks* |
+ <%= t('.emphasizedtext') %> |
+ <%= raw t('.emphasizedtextdesc') %> |
- strong text |
- surround text with **two asterisks** |
+ <%= t('.strongtext') %> |
+ <%= raw t('.strongtextdesc') %> |
- fixed width |
- surround text with `backticks` |
+ <%= t('.fixedwidth') %> |
+ <%= raw t('.fixedwidthdesc') %> |
linked text |
- [linked text](http://example.com/) or just a bare URL
- to create without a title |
+ style="color: inherit;"><%= t('.linkedtext') %>
+ <%= raw t('.linkedtextdesc') %> |
- quoted text |
- prefix text with > |
+ <%= t('.quotedtext') %> |
+ <%= raw t('.quotedtextdesc') %> |
- pre
- text |
- prefix text with at least 4 spaces |
+ <%= t('.pretext') %> |
+ <%= raw t('.pretextdesc') %> |
<% if defined?(allow_images) && allow_images %>
- (inline image) |
- ![alt text](http://example.com/image.jpg) (only allowed in
- story text |
+ <%= t('.inlineimage') %> |
+ <%= raw t('.inlineimagedesc') %> |
<% end %>
diff --git a/config/application.rb b/config/application.rb
index c65c4f9..e0b69f0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,7 +17,7 @@ module Lobsters
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
- config.time_zone = 'Central Time (US & Canada)'
+ config.time_zone = 'Europe/Paris'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f77e66f..3243959 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -69,6 +69,21 @@ en:
delete: "delete"
reply: "reply"
about: "on:"
+ global:
+ markdownhelp:
+ emphasizedtext: "emphasized text"
+ emphasizedtextdesc: "surround text with
*asterisks*"
+ strongtext: "strong text"
+ strongtextdesc: "
surround text with **two asterisks**"
+ fixedwidth: "fixed width"
+ fixedwidthdesc: "surround text with `backticks`"
+ linkedtext: "linked text"
+ linkedtextdesc: "[linked text](http://example.com/) or just a bare URL to create without a title"
+ quotedtext: "quoted text"
+ quotedtextdesc: "prefix text with >"
+ pretextdesc: "prefix text with at least 4 spaces"
+ inlineimage: "(inline image)"
+ inlineimagedesc: "![alt text](http://example.com/image.jpg) (only allowed in story text)"
home:
index:
homerecentsdesc: "The newest stories with a random sampling of recently submitted stories that have not yet reached the front page."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 39c2ffc..7924284 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -71,6 +71,22 @@ fr:
delete: "supprimer"
reply: "répondre"
about: "sur :"
+ global:
+ markdownhelp:
+ emphasizedtext: "italique"
+ emphasizedtextdesc: "encadrer le texte avec des *astérisques*"
+ strongtext: "gras"
+ strongtextdesc: "encadrer le texte avec **deux astérisques**"
+ fixedwidth: "chasse fixe"
+ fixedwidthdesc: "encadrer le texte avec `accent grave (backquote)`"
+ linkedtext: "lien"
+ linkedtextdesc: "[texte du lien](http://example.com/) ou bien l'url seule sans titre"
+ quotedtext: "citation"
+ quotedtextdesc: "précéder le texte avec >"
+ pretext: "texte tabulé"
+ pretextdesc: "précéder le texte avec au moins 4 spaces"
+ inlineimage: "(image en ligne)"
+ inlineimagedesc: "![texte de substitution](http://example.com/image.jpg) (autorisé seulement dans les articles)"
home:
index:
homerecentsdesc: "Les plus récentes infos avec un panaché aléatoire des infos récentes soumises qui n'ont pas encore atteint la page principale."