storytime 2.1.5 → 2.1.7

data/app/models/storytime/version.rb

@@ -1,7 +1,7 @@
 module Storytime
   class Version < ActiveRecord::Base
     include Storytime::ScopedToSite
-    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :versionable, polymorphic: true
   end
 end

data/app/policies/storytime/post_policy.rb

@@ -81,7 +81,7 @@ module Storytime
     end
 
     def permitted_attributes
-      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :notifications_enabled, :published_at_time, {:tag_list => []}]
+      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :notifications_enabled, :published_at_time, :canonical_url, {:tag_list => []}]
       attrs << :published if publish?
       attrs
     end

data/app/views/storytime/dashboard/_navigation.html.erb

@@ -103,15 +103,6 @@
     <ul class="nav nav-menu-nav">
       <li><%= link_to icon("plus", "New Blog"), [storytime, :new, :dashboard, :blog], class: "storytime-modal-trigger", remote: true %></li>
     </ul>
-
-    <% if Pundit.policy(current_user, :admin).manage? && StorytimeAdmin.models.length > 0 %>
-      <h4 class="nav-menu-divider">Admin</h4>
-      <ul class="nav nav-menu-nav">
-        <% StorytimeAdmin.models.sort.each do |model| %>
-          <%= nav_item model.pluralize.titleize, [storytime_admin, *polymorphic_route_components(model)], nav_id: [:admin, model] %>
-        <% end %>
-      </ul>
-    <% end %>
   </div>
 </nav>
 <div id='off-canvas-overlay'></div>

data/app/views/storytime/dashboard/blog_posts/_form.html.erb

@@ -5,7 +5,7 @@
         <div class="row">
           <div class="col-md-8 col-md-offset-2">
             <ul class="list-group" style="margin: 0;">
-              <%= render partial: 'storytime/dashboard/versions/version.html.erb', collection: @post.versions.order(created_at: :desc), locals: { versionable: @post } %>
+              <%= render partial: 'storytime/dashboard/versions/version', collection: @post.versions.order(created_at: :desc), locals: { versionable: @post } %>
             </ul>
             <%= link_to "Done", '#', class: "btn btn-primary btn-outline pull-right", style: "margin-top: 10px; margin-right: 15px;", data: { toggle: 'collapse', target: '#versions-panel' } %>
           </div>
@@ -49,6 +49,10 @@
                   <%= f.input :published_at, as: :date_time_picker, label: "Publish Date/Time", input_html: { style: "display: inline;" } %>
                 </div>
               </div>
+
+              <div class="post_field post_canonical_url">
+                <%= f.input :canonical_url, required: false, label: "Canonical URL", placeholder: "https://example.com/original-post", hint: "Optional. Set this if the post was originally published elsewhere." %>
+              </div>
       
               <hr>
 

data/app/views/storytime/dashboard/blogs/edit.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "form.html.erb")
+json.html(render partial: "form", formats: [:html])

data/app/views/storytime/dashboard/blogs/index.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "storytime/dashboard/blogs/blog.html.erb", collection: Storytime::Blog.all)
+json.html(render partial: "storytime/dashboard/blogs/blog", collection: Storytime::Blog.all, formats: [:html])

data/app/views/storytime/dashboard/blogs/new.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "form.html.erb")
+json.html(render partial: "form", formats: [:html])

data/app/views/storytime/dashboard/media/_gallery.html.erb

@@ -3,7 +3,7 @@
     <% @media.in_groups_of(5, false) do |media_row| %>
       <div class="row">
         <% media_row.each do |media| %>
-          <%= render partial: "storytime/dashboard/media/media.html.erb", locals: { media: media } %>
+          <%= render "storytime/dashboard/media/media", media: media %>
         <% end %>
       </div>
     <% end %>

data/app/views/storytime/dashboard/media/_modal.html.erb

@@ -15,8 +15,8 @@
         </div>
 
         <div>
-          <%= render "storytime/dashboard/media/form.html.erb" %>
-          <div id="media_gallery_container"><%= render "storytime/dashboard/media/gallery.html.erb" %></div>
+          <%= render "storytime/dashboard/media/form" %>
+          <div id="media_gallery_container"><%= render "storytime/dashboard/media/gallery" %></div>
         </div>
       </div>
       <div class='modal-footer'>

data/app/views/storytime/dashboard/media/show.json.jbuilder

@@ -1,2 +1,2 @@
 json.(@media, :id, :file_url, :user_id, :created_at)
-json.html render(partial: "storytime/dashboard/media/media.html.erb", locals: {media: @media})
+json.html render(partial: "storytime/dashboard/media/media", locals: {media: @media}, formats: [:html])

data/app/views/storytime/dashboard/memberships/_edit.html.erb

@@ -9,7 +9,7 @@
     </div>
     <div class="scroll-panel-body">
 
-      <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+      <%= render 'storytime/dashboard/settings_tabs' %>
       
       <input type="hidden" value="<%= params[:controller].camelize %>" id="storytime-modal-controller">
       <input type="hidden" value="<%= params[:action].camelize %>" id="storytime-modal-action">

data/app/views/storytime/dashboard/memberships/_index.html.erb

@@ -8,7 +8,7 @@
   </div>
   <div class="scroll-panel-body">
 
-    <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+    <%= render 'storytime/dashboard/settings_tabs' %>
       
     <input type="hidden" value="<%= params[:controller].camelize %>" id="storytime-modal-controller">
     <input type="hidden" value="<%= params[:action].camelize %>" id="storytime-modal-action">
@@ -24,14 +24,14 @@
             </h4>
           </div>
           <div id="collapseListGroup1" class="panel-collapse collapse" role="tabpanel" aria-labelledby="collapseListGroupHeading1">
-            <%= render "storytime/dashboard/memberships/form.html.erb" %>
+            <%= render "storytime/dashboard/memberships/form" %>
           </div>
         </div>
       </div>
     <% end %>
     
     <ul class="list-group list-group-button-links">
-      <%= render partial: 'storytime/dashboard/memberships/membership.html.erb', collection: @memberships %>
+      <%= render partial: 'storytime/dashboard/memberships/membership', collection: @memberships %>
     </ul>
 
     <%= paginate @memberships, remote: true %>

data/app/views/storytime/dashboard/memberships/_new.html.erb

@@ -9,7 +9,7 @@
     </div>
     <div class="scroll-panel-body">
 
-      <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+      <%= render 'storytime/dashboard/settings_tabs' %>
 
       <%= f.input :storytime_name %>
       <%= f.input :email %>

data/app/views/storytime/dashboard/memberships/edit.json.jbuilder

@@ -1,2 +1,2 @@
 json.(@membership)
-json.html(render partial: "edit.html.erb")
+json.html(render partial: "edit", formats: [:html])

data/app/views/storytime/dashboard/memberships/index.json.jbuilder

@@ -1,2 +1,2 @@
 json.(@memberships)
-json.html(render partial: "storytime/dashboard/memberships/index.html.erb")
+json.html(render partial: "storytime/dashboard/memberships/index", formats: [:html])

data/app/views/storytime/dashboard/memberships/new.json.jbuilder

@@ -1,2 +1,2 @@
 json.(@membership)
-json.html(render partial: "new.html.erb")
+json.html(render partial: "new", formats: [:html])

data/app/views/storytime/dashboard/memberships/save.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "storytime/dashboard/memberships/index.html.erb")
+json.html(render partial: "storytime/dashboard/memberships/index", formats: [:html])

data/app/views/storytime/dashboard/pages/_form.html.erb

@@ -5,7 +5,7 @@
         <div class="row">
           <div class="col-md-8 col-md-offset-2">
             <ul class="list-group" style="margin: 0;">
-              <%= render partial: 'storytime/dashboard/versions/version.html.erb', collection: @post.versions.order(created_at: :desc), locals: { versionable: @post } %>
+              <%= render partial: 'storytime/dashboard/versions/version', collection: @post.versions.order(created_at: :desc), locals: { versionable: @post } %>
             </ul>
             <%= link_to "Done", '#', class: "btn btn-primary btn-outline pull-right", style: "margin-top: 10px; margin-right: 15px;", data: { toggle: 'collapse', target: '#versions-panel' } %>
           </div>

data/app/views/storytime/dashboard/posts/_directory.html.erb

@@ -0,0 +1,18 @@
+<li class="list-group-item">
+  <%= link_to [
+                storytime, 
+                :dashboard, 
+                Storytime::Page, 
+                dir: [params[:dir], directory].compact.join("/"),
+                published: params[:published],
+                draft: params[:draft]
+              ], 
+              id: "", 
+              class: "list-group-link" do %>
+    <div class="row">
+      <div class="col-md-8">
+        <h4><%= icon("folder-open-o") %> <%= directory %></h4>
+      </div>
+    </div>
+  <% end %>
+</li>

data/app/views/storytime/dashboard/posts/_form.html.erb

@@ -5,7 +5,7 @@
         <div class="row">
           <div class="col-md-8 col-md-offset-2">
             <ul class="list-group" style="margin: 0;">
-              <%= render partial: 'storytime/dashboard/versions/version.html.erb', collection: @post.versions.order(created_at: :desc), locals: { versionable: @post } %>
+              <%= render partial: 'storytime/dashboard/versions/version', collection: @post.versions.order(created_at: :desc), locals: { versionable: @post } %>
             </ul>
             <%= link_to "Done", '#', class: "btn btn-primary btn-outline pull-right", style: "margin-top: 10px; margin-right: 15px;", data: { toggle: 'collapse', target: '#versions-panel' } %>
           </div>

data/app/views/storytime/dashboard/posts/_list.html.erb

@@ -1,26 +1,2 @@
-<% @posts.each do |post| %>
-  <li class="list-group-item" id="<%= post.class.to_s.downcase.split("::").last %>_<%= post.id %>">
-    <%= link_to [:edit, :dashboard, post], id: "", class: "list-group-link" do %>
-      <div class="row">
-        <div class="col-md-8">
-           <h4><%= post.title %></h4>
-        </div>
-      </div>
-     
-      <p class="text-muted">
-        <% if post.published? && post.published_at <= Time.now %>
-          Published <%= time_ago_in_words post.published_at %> ago
-        <% elsif post.published? %>
-          <span class="label label-warning">Draft</span>
-          Scheduled to publish on <%= post.published_at.strftime("%B %e at %l:%M %p") %>
-        <% else %>
-          <span class="label label-warning">Draft</span>
-          Last edited <%= time_ago_in_words post.updated_at %> ago
-        <% end %>
-      </p>
-    <% end %>
-    <div class="list-group-actions">
-      <%= delete_resource_link post, [:dashboard, post] %>
-    </div>
-  </li>
-<% end %>
+<%= render collection: @directories, partial: "storytime/dashboard/posts/directory" %>
+<%= render collection: @posts, partial: "storytime/dashboard/posts/post" %>

data/app/views/storytime/dashboard/posts/_new_button.html.erb

@@ -4,7 +4,7 @@
   </button>
   <ul class="dropdown-menu dropdown-menu-right" role="menu">
     <% Storytime.post_types.reject{|type| %w[Storytime::Post Storytime::Page Storytime::Blog].include? type }.each do |post_type| %>
-      <li><%= link_to "#{post_type.split('::').last.titleize}", [:new, :dashboard, @blog, post_type.split("::").last.tableize.singularize] %></li>
+      <li><%= link_to "#{post_type.split('::').last.titleize}", [:new, :dashboard, @blog, post_type.split("::").last.tableize.singularize.to_sym] %></li>
     <% end %>
   </ul>
 </div>

data/app/views/storytime/dashboard/posts/_post.html.erb

@@ -0,0 +1,28 @@
+<li class="list-group-item" id="<%= post.class.to_s.downcase.split("::").last %>_<%= post.id %>">
+  <%= link_to [:edit, :dashboard, post], id: "", class: "list-group-link" do %>
+    <div class="row">
+      <div class="col-md-8">
+         <h4><%= post.title %></h4>
+      </div>
+    </div>
+
+    <div class="row post-row-subtext">
+      <div class="col-md-6"><%= "/#{post.slug}" %></div>
+
+      <div class="col-md-6 text-muted text-right">
+        <% if post.published? && post.published_at <= Time.now %>
+          Published <%= time_ago_in_words post.published_at %> ago
+        <% elsif post.published? %>
+          <span class="label label-warning">Draft</span>
+          Scheduled to publish on <%= post.published_at.strftime("%B %e at %l:%M %p") %>
+        <% else %>
+          <span class="label label-warning">Draft</span>
+          Last edited <%= time_ago_in_words post.updated_at %> ago
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+  <div class="list-group-actions">
+    <%= delete_resource_link post, [:dashboard, post] %>
+  </div>
+</li>

data/app/views/storytime/dashboard/posts/_sorts.html.erb

@@ -0,0 +1,21 @@
+<li class="pull-right">
+  <div class="btn-group margin-right" style="margin-right: 10px;">
+    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+      Sort <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu dropdown-menu-right" role="menu" style="top: 125%;">
+      <li>
+        <%= link_to "Title", { sort: "title" } %>
+      </li>
+      <li>
+        <%= link_to "Slug", { sort: "slug" } %>
+      </li>
+      <li>
+        <%= link_to "Publish Date", { sort: "published_at" } %>
+      </li>
+      <li>
+        <%= link_to "Creation Date", { sort: "created_at" } %>
+      </li>
+    </ul>
+  </div>
+</li>

data/app/views/storytime/dashboard/posts/index.html.erb

@@ -5,7 +5,7 @@
       <%= link_to "#", class: "btn btn-default btn-icon pull-left visible-xs visible-sm", data: { toggle: "off-canvas",  target: "#dashboard-nav" } do %>
         <i class="icon-st-icons-st-logo"></i>
       <% end %>
-      
+
       <% if @blog %>
         <div class="pull-right">
 
@@ -61,8 +61,10 @@
             <%= link_to "Published", [:dashboard, current_post_type, published: 'true'] %>
           <% end %>
         </li>
+
+        <%= render "storytime/dashboard/posts/sorts" %>
       </ul>
-      <ul class="list-group list-group-button-links">
+      <ul class="list-group list-group-button-links post-list">
         <%= render 'list' %>
       </ul>
       <div class="pagination-wrapper">
@@ -70,4 +72,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

data/app/views/storytime/dashboard/roles/_form.html.erb

@@ -9,7 +9,7 @@
     </div>
     <div class="scroll-panel-body">
 
-      <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+      <%= render 'storytime/dashboard/settings_tabs' %>
 
       <table class="table table-hover">
         <thead>

data/app/views/storytime/dashboard/roles/edit.json.jbuilder

@@ -1 +1 @@
-json.html render(partial: "storytime/dashboard/roles/form.html.erb")
+json.html render(partial: "storytime/dashboard/roles/form", formats: [:html])

data/app/views/storytime/dashboard/sites/_form.html.erb

@@ -12,7 +12,7 @@
       <input type="hidden" value="<%= params[:controller].camelize %>" id="storytime-modal-controller">
       <input type="hidden" value="<%= params[:action].camelize %>" id="storytime-modal-action">
       
-      <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+      <%= render 'storytime/dashboard/settings_tabs' %>
 
       <%= f.error_notification %>
       <%= f.input :title %>

data/app/views/storytime/dashboard/sites/site.json.jbuilder

@@ -1,2 +1,2 @@
 json.(@site)
-json.html render(partial: "storytime/dashboard/sites/form.html.erb")
+json.html render(partial: "storytime/dashboard/sites/form", formats: [:html])

data/app/views/storytime/dashboard/snippets/_index.html.erb

@@ -9,7 +9,7 @@
   <div class="scroll-panel-body">
     
     <ul class="list-group list-group-button-links">
-      <%= render partial: 'snippet.html.erb', collection: @snippets %>
+      <%= render partial: 'snippet', collection: @snippets %>
     </ul>
 
     <%= paginate @snippets, param_name: "page_number", remote: true %>

data/app/views/storytime/dashboard/snippets/edit.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "form.html.erb")
+json.html(render partial: "form", formats: [:html])

data/app/views/storytime/dashboard/snippets/index.json.jbuilder

@@ -1,4 +1,4 @@
 if @snippet.present?
   json.(@snippet, :id, :content, :created_at)
 end
-json.html(render partial: "index.html.erb")
+json.html(render partial: "index", formats: [:html])

data/app/views/storytime/dashboard/snippets/new.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "form.html.erb")
+json.html(render partial: "form", formats: [:html])

data/app/views/storytime/dashboard/subscriptions/_form.html.erb

@@ -9,7 +9,7 @@
     </div>
     <div class="scroll-panel-body">
 
-      <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+      <%= render 'storytime/dashboard/settings_tabs', formats: [:html] %>
       
       <%= f.input :site_id, as: :hidden, input_html: { value: @current_storytime_site.id }  %>
       <%= f.input :email %>

data/app/views/storytime/dashboard/subscriptions/_index.html.erb

@@ -8,10 +8,10 @@
   </div>
   <div class="scroll-panel-body">
 
-    <%= render 'storytime/dashboard/settings_tabs.html.erb' %>
+    <%= render 'storytime/dashboard/settings_tabs' %>
     
     <ul class="list-group list-group-button-links">
-      <%= render partial: 'subscription.html.erb', collection: @subscriptions %>
+      <%= render partial: 'subscription', collection: @subscriptions %>
     </ul>
 
     <%= paginate @subscriptions, param_name: "page_number", remote: true %>

data/app/views/storytime/dashboard/subscriptions/form.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "form.html.erb")
+json.html(render partial: "form", formats: [:html])

data/app/views/storytime/dashboard/subscriptions/index.json.jbuilder

@@ -1 +1 @@
-json.html(render partial: "index.html.erb")
+json.html(render partial: "index", formats: [:html])

data/app/views/storytime/dashboard/versions/_versions_info.html.erb

@@ -4,7 +4,7 @@
   </div>
   <div id="versions-panel" class="collapse">
     <ul class="list-group" style="margin: 0;">
-      <%= render partial: 'storytime/dashboard/versions/version.html.erb', collection: versionable.versions.order(created_at: :desc), locals: {versionable: versionable } %>
+      <%= render partial: 'storytime/dashboard/versions/version', collection: versionable.versions.order(created_at: :desc), locals: {versionable: versionable } %>
     </ul>
   </div>
 </div>

data/app/views/storytime/posts/show.html.erb

@@ -1,3 +1,9 @@
+<% if @post.canonical_url.present? %>
+  <% content_for :head do %>
+    <link rel="canonical" href="<%= @post.canonical_url %>">
+  <% end %>
+<% end %>
+
 <div class="container">
   <% if params[:preview] %>
     <div class="alert alert-info" role="alert">Currently viewing a preview of "<%= @post.title %>".</div>

data/app/views/storytime/sites/_google_analytics_code.html.erb

@@ -1,13 +1,10 @@
 <% unless @current_storytime_site.nil? || @current_storytime_site.ga_tracking_id.blank? %>
+  <script async src="https://www.googletagmanager.com/gtag/js?id=<%= @current_storytime_site.ga_tracking_id %>"></script>
   <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '<%= @current_storytime_site.ga_tracking_id %>', {'allowAnchor': true});
-
-    ga('send', 'pageview', { 'page': location.pathname + location.search + location.hash});
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
 
+    gtag('config', '<%= @current_storytime_site.ga_tracking_id %>');
   </script>
 <% end %>

data/config/initializers/assets.rb

@@ -1 +1,2 @@
-Rails.application.config.assets.precompile += %w( chosen-sprite.png chosen-sprite@2x.png tidy.js )
+Rails.application.config.assets.precompile += %w( chosen-sprite.png chosen-sprite@2x.png tidy.js )
+Rails.application.config.assets.precompile += %w( *.svg *.eot *.woff *.woff2 *.ttf )

data/config/initializers/friendly_id.rb

@@ -17,7 +17,7 @@ FriendlyId.defaults do |config|
   config.use :reserved
 
   config.reserved_words = %w(new edit index session login logout users admin
-    stylesheets assets javascripts images)
+    stylesheets assets javascripts images fonts)
 
   #  ## Friendly Finders
   #

data/config/initializers/url_for_patch.rb

@@ -1,14 +1,25 @@
-module ActionDispatch
-  module Routing
-    class RouteSet
+if Rails::VERSION::MAJOR < 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0)
+  module ActionDispatch
+    module Routing
+      class RouteSet
 
-      def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
-        Storytime::PostUrlHandler.handle_url(options)
-        url_for_without_storytime(options, route_name, url_strategy)
-      end
+        if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 1
+          def url_for_with_storytime(options = {})
+            Storytime::PostUrlHandler.handle_url(options)
+            url_for_without_storytime(options)
+          end
+        else
+          def url_for_with_storytime(options, route_name = nil, url_strategy = UNKNOWN)
+            Storytime::PostUrlHandler.handle_url(options)
+            url_for_without_storytime(options, route_name, url_strategy)
+          end
+        end
 
-      alias_method_chain :url_for, :storytime
+        alias_method_chain :url_for, :storytime
 
+      end
     end
   end
+else
+  ActionDispatch::Routing::RouteSet.prepend(Storytime::PostUrlHandler)
 end

data/config/locales/devise.zh-CN.yml

@@ -0,0 +1,59 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+zh-CN:
+  devise:
+    confirmations:
+      confirmed: "你的电子邮件地址以被成功确认。"
+      send_instructions: "你在几分钟后会收到一封电子邮件告诉你如何确认你的电子邮件地址。"
+      send_paranoid_instructions: "如果我们的数据库中保存有你的电子邮件地址，你会在几分钟内收到一封邮件告诉你如何确认的电子邮件。"
+    failure:
+      already_authenticated: "你已经登录。"
+      inactive: "你的帐户还未激活。"
+      invalid: "非法的 %{authentication_keys} 或密码。"
+      locked: "你的帐号已被锁定。"
+      last_attempt: "你还有最后一次尝试机会，如果再次失败你的帐号将被锁定。"
+      not_found_in_database: "非法的 %{authentication_keys} 或密码。"
+      timeout: "你的登录超时，请重新登录。"
+      unauthenticated: "你需要登录或注册才能继续操作。"
+      unconfirmed: "你需要确认你的电子邮件地址才能继续。"
+    mailer:
+      confirmation_instructions:
+        subject: "帐户确认指南"
+      reset_password_instructions:
+        subject: "重置密码指南"
+      unlock_instructions:
+        subject: "Pivorak: 解锁指南"
+    omniauth_callbacks:
+      failure: "由于%{reason}，无法从%{kind} 认证。"
+      success: "成功从 %{kind} 认证帐户。"
+    passwords:
+      no_token: "如果没有密码重置邮件无法访问这个页面。如果你是从密码重置邮件访问过来的，请确认输入的网址完整。"
+      send_instructions: "在几分钟内你会收到一封密码重置邮件。"
+      send_paranoid_instructions: "如果我们的数据库中保存有你的电子邮件地址，你会在几分钟内收到一封如何恢复密码的邮件。"
+      updated: "你的密码已被成功更改，你现在已经登录。"
+      updated_not_active: "你的密码已被成功更改。"
+    registrations:
+      destroyed: "再见！你的帐户已被成功取消。希望能再次见到你。"
+      signed_up: "欢迎！你已经成功注册。"
+      signed_up_but_inactive: "你已经成功注册。但是由于你的帐户未激活，你仍无法登录。"
+      signed_up_but_locked: "你已经成功注册。但是由于你的帐户被锁定，你仍无法登录。"
+      signed_up_but_unconfirmed: "我们已向你的邮箱发送了一封确认邮件。请单击邮件中的链接激活你的帐户。"
+      update_needs_confirmation: "你已经成功更新帐户，但我们需要验证你的电子邮件地址。请检查你的邮件并确认你的子邮件地址。"
+      updated: "你的帐户已被成功更新。"
+    sessions:
+      signed_in: "成功登录。"
+      signed_out: "成功注销。"
+    unlocks:
+      send_instructions: "在几分钟内你会收到一封如何解锁帐户的邮件。"
+      send_paranoid_instructions: "如果你的帐户存在，在几分钟内你会收到一封如何解锁帐户的邮件。"
+      unlocked: "你的帐户已被成功解锁，请重新登录。"
+  errors:
+    messages:
+      already_confirmed: "已确认，请尝试登录"
+      confirmation_period_expired: "需要在 %{period} 内确认，请重新注册"
+      expired: "已过期，请重新注册"
+      not_found: "未找到"
+      not_locked: "未被锁定"
+      not_saved:
+        one: "出现一个错误导致 %{resource} 不能被保存："
+        other: "出现 %{count} 个错误导致 %{resource} 不能被保存："

data/config/locales/kaminari.zh-CN.yml

@@ -0,0 +1,17 @@
+zh-CN:
+  views:
+    pagination:
+      first: "«"
+      last: "»"
+      previous: "‹"
+      next: "›"
+      truncate: "…"
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          zero: "未找到 %{entry_name}"
+          one: "显示 <b>1</b> 条 %{entry_name}"
+          other: "显示 <b>所有 %{count}</b> 条 %{entry_name}"
+      more_pages:
+        display_entries: "显示 %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> 共 <b>%{total}</b>"

data/config/locales/simple_form.zh-CN.yml

@@ -0,0 +1,26 @@
+zh-CN:
+  simple_form:
+    "yes": '是'
+    "no": '否'
+    required:
+      text: '必添'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "请检查如下问题："
+    # Labels and hints examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+