aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/blog/posts/_post.html.erb4
-rw-r--r--app/views/blog/posts/tagged.html.erb2
-rw-r--r--app/views/blog/shared/_post.html.erb4
-rw-r--r--config/locales/en.yml22
-rw-r--r--config/locales/fr.yml33
-rw-r--r--public/stylesheets/refinerycms-blog.css2
6 files changed, 57 insertions, 10 deletions
diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb
index f589a33..e5aabdb 100644
--- a/app/views/blog/posts/_post.html.erb
+++ b/app/views/blog/posts/_post.html.erb
@@ -8,8 +8,8 @@
<h1><%= @blog_post.title %></h1>
<details>
<time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
- <%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>.
- </time><%= " by #{@blog_post.author.username}" if @blog_post.author.present? %>
+ <%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>
+ </time><%= "#{t('blog.posts.show.by')} #{@blog_post.author.username}" if @blog_post.author.present? %>.
<% if (categories = @blog_post.categories).any? %>
<aside class='filed_in'>
<%= t('blog.posts.show.filed_in') %>
diff --git a/app/views/blog/posts/tagged.html.erb b/app/views/blog/posts/tagged.html.erb
index 29de791..904150f 100644
--- a/app/views/blog/posts/tagged.html.erb
+++ b/app/views/blog/posts/tagged.html.erb
@@ -1,4 +1,4 @@
-<% content_for :body_content_title, "Posts tagged &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
+<% content_for :body_content_title, "#{t('.posts_tagged')} &#8220;#{@tag_name.titleize}&#8221;".html_safe -%>
<% content_for :body_content_left do %>
<% if @blog_posts.any? %>
diff --git a/app/views/blog/shared/_post.html.erb b/app/views/blog/shared/_post.html.erb
index 716c1ad..05c6af2 100644
--- a/app/views/blog/shared/_post.html.erb
+++ b/app/views/blog/shared/_post.html.erb
@@ -4,8 +4,8 @@
<h1><%= link_to post.title, blog_post_url(post) %></h1>
<details>
<time datetime="<%=l post.published_at.to_date, :format => :default %>" class='posted_at'>
- <%= t('blog.shared.posts.created_at', :when => l(post.published_at.to_date, :format => :short)) %>.
- </time><%= " by #{post.author.username}" if post.author.present? %>
+ <%= t('blog.shared.posts.created_at', :when => l(post.published_at.to_date, :format => :short)) %>
+ </time><%= "#{t('blog.shared.posts.by')} #{post.author.username}" if post.author.present? %>.
<% if (categories = post.categories).any? %>
<aside class='filed_in'>
<%= t('filed_in', :scope => 'blog.posts.show') %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f5b5461..eb886a9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -126,8 +126,28 @@ en:
filed_in: Filed in
tagged: Tagged
submit: Send comment
+ name: Name
+ email: Email
+ message: Message
+ by: by
tagged:
no_blog_articles_yet: There are no blog articles posted yet. Stay tuned.
+ posts_tagged: Posts tagged
archive:
blog_archive_for: 'Blog Archive for %{date}'
- no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'
+ no_blog_articles_posted: 'There are no blog articles posted for %{date}. Stay tuned.'
+ activerecord:
+ models:
+ blog_category: Category
+ blog_comment: Comment
+ blog_post: Blog post
+ attributes:
+ blog_category:
+ title: Title
+ blog_comment:
+ name: Name
+ email: Email
+ message: Message
+ blog_post:
+ title: Title
+ body: Body \ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c71a01f..272be07 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -40,6 +40,8 @@ fr:
published_at: Date de publication
index:
no_items_yet: 'Il n''y a aucun article pour l''instant. Cliquez sur "%{create}" pour ajouter votre premier article.'
+ uncategorized:
+ no_items_yet: 'Il n''y a aucun article non catégorisé.'
post:
view_live_html: 'Voir cet article sur le site<br/><em>(Ouvre une nouvelle fenêtre)</em>'
edit: Modifier cet article
@@ -67,6 +69,7 @@ fr:
title: Articles
manage: Gérer les articles
new: Créer un nouvel article
+ uncategorized: Aricles non catégorisés
settings:
title: Paramêtres
moderation: Modération
@@ -88,16 +91,19 @@ fr:
categories:
title: Catégories
rss_feed:
- title: RSS Feed
+ title: Flux RSS
subscribe: Souscrire
posts:
other: Autres articles
created_at: 'Écrit le %{when}'
read_more: Lire la suite
+ by: 'par'
comments:
singular: commentaire
none: aucun commentaire
archives: Archives
+ tags:
+ title: "Mots clés"
categories:
show:
no_posts: 'Il n''y a aucun article pour cette catégorie.'
@@ -119,7 +125,30 @@ fr:
add: Ajouter un commentaire
other: Autres articles
filed_in: Classé dans
+ tagged: Taggé
submit: Envoyer le commentaire
+ name: Nom
+ email: Email
+ message: Message
+ by: par
+ tagged:
+ no_blog_articles_yet: "Il n'y a aucun article pour l'instant. Restez en alerte."
+ posts_tagged: Articles taggés
archive:
blog_archive_for: 'Archive du blog pour le %{date}'
- no_blog_articles_posted: "Il n'y a aucun article pour la date du %{date}. Restez à l'écoute."
+ no_blog_articles_posted: "Il n'y a aucun article pour la date du %{date}. Restez en alerte."
+ activerecord:
+ models:
+ blog_category: Categorie
+ blog_comment: Commentaire
+ blog_post: Article
+ attributes:
+ blog_category:
+ title: Titre
+ blog_comment:
+ name: Nom
+ email: Email
+ message: Message
+ blog_post:
+ title: Titre
+ body: Corps
diff --git a/public/stylesheets/refinerycms-blog.css b/public/stylesheets/refinerycms-blog.css
index 2e891ee..ef6f224 100644
--- a/public/stylesheets/refinerycms-blog.css
+++ b/public/stylesheets/refinerycms-blog.css
@@ -2,8 +2,6 @@
width: auto;
}
.blog_post .posted_at{
- display:block;
- margin:0 0 10px;
}
.post_categories .filed_in {
display: inline;