From 81a99895f7dfcae346105bea740b61a63828bb74 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Wed, 8 Apr 2015 01:58:13 +0800
Subject: [PATCH] translate creative protocol into English

---
 app/views/blogs/_comment.html.slim       | 4 ++--
 app/views/blogs/_post.html.slim          | 8 ++++----
 app/views/common/_copyright.en.html.slim | 2 ++
 config/locales/en.yml                    | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 app/views/common/_copyright.en.html.slim

diff --git a/app/views/blogs/_comment.html.slim b/app/views/blogs/_comment.html.slim
index a3e3267..c3b87b8 100644
--- a/app/views/blogs/_comment.html.slim
+++ b/app/views/blogs/_comment.html.slim
@@ -17,5 +17,5 @@
           |{{ comment.name + "  • " }}
           span.created-at
             |{{ comment.created_at }}
-        p.comment-content
-          | {{ comment.content }}
+        / ignore "white-space: pre" 's effect
+        <p class=comment-content>{{ comment.content }}</p>
diff --git a/app/views/blogs/_post.html.slim b/app/views/blogs/_post.html.slim
index 4d98a30..03601e1 100644
--- a/app/views/blogs/_post.html.slim
+++ b/app/views/blogs/_post.html.slim
@@ -4,7 +4,7 @@
   == post.content_html
 
 p.ptag.published-at
-  | 发表于:
+  | #{t('announce_at')}
   span #{format_date(post.created_at)}
 
 = render 'common/copyright'
@@ -14,14 +14,14 @@ p ng-controller="LikesController" ng-cloak=""
   button.like-button ng-show="! is_liked " ng-click="submit()"
     |{{ count }}
     span Like
-  button.like-button.liked ng-show=" is_liked " ng-click="cancel()" 
+  button.like-button.liked ng-show=" is_liked " ng-click="cancel()"
     |{{ count }}
     span Like
   div ng-controller = "QRCodesController"
     .qrcode
       a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()"
-        i.fi-link 
-        | 二维码
+        i.fi-link
+        | #{t('qr_code')}
 
     .social-share ng-show='qrcode'
       .qrcode-wrapper
diff --git a/app/views/common/_copyright.en.html.slim b/app/views/common/_copyright.en.html.slim
new file mode 100644
index 0000000..ad92042
--- /dev/null
+++ b/app/views/common/_copyright.en.html.slim
@@ -0,0 +1,2 @@
+p.copyright.published-at.ptag
+  | © Creative Commons - ShareAlike - NonCommercial - Attribution
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f46191..5a20d70 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,7 @@ en:
   edit: 'Edit'
   destroy: 'Destroy'
   announce_at: "Published at "
+  qr_code: 'QR Code'
   visited_count: "Viewed "
   nocontent: "No More Content Here"
   prev: '← Prev Post'