refinerycms-blog 1.6.2 → 1.7.0

data/app/views/admin/blog/comments/index.html.erb

@@ -1,7 +1,7 @@
 <%= render :partial => '/admin/blog/submenu' %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
+    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
     <% if @blog_comments.any? %>
       <%=# will_paginate @blog_comments
       %>
@@ -14,7 +14,7 @@
       <%=# will_paginate @blog_comments
       %>
     <% else %>
-      <p><%= t('admin.search_no_results') %></p>
+      <p><%= t('search_no_results', :scope => 'admin') %></p>
     <% end %>
   <% else %>
     <% if @blog_comments.any? %>
@@ -28,7 +28,7 @@
     <% else %>
       <h3>
         <%= t('.no_items_yet',
-              :type => t("admin.blog.submenu.comments.#{action_name.gsub('index', 'new')}").downcase) %>
+              :type => t(action_name.gsub('index', 'new'), :scope => 'admin.blog.submenu.comments').downcase) %>
       </h3>
     <% end %>
   <% end %>

data/app/views/admin/blog/posts/_form.css.erb

@@ -1,8 +1,13 @@
 <style type='text/css'>
+  ul.blog_categories{
+    height:200px;
+    overflow:auto;
+    border:1px solid #ccc;
+    padding:5px;
+  }
   ul.blog_categories, ul.blog_categories li {
     list-style: none;
-    margin: 0px;
-    padding: 0px;
+    margin:5px 0;
   }
   a#copy_body_link {
     background: url("/images/refinery/icons/add.png") no-repeat scroll 0 6px transparent;

data/app/views/admin/blog/posts/_form.html.erb

@@ -14,10 +14,10 @@
     <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
       <ul id='page_parts'>
         <li class='ui-state-default ui-state-active'>
-          <%= link_to "Body", "#page_part_body" %>
+          <%= link_to t('body', :scope => 'activerecord.attributes.blog_post'), "#page_part_body" %>
         </li>
         <li class='ui-state-default'>
-          <%= link_to "Teaser", "#page_part_teaser" %>
+          <%= link_to t('teaser', :scope => 'activerecord.attributes.blog_post'), "#page_part_teaser" %>
         </li>
         <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
           <li class='ui-state-default' id="custom_<%= tab.name %>_tab">
@@ -49,7 +49,7 @@
   </div>
   
   <div class='field'>
-    <%= f.label :tag_list, "Tags" -%>
+    <%= f.label :tag_list, t('blog.shared.tags.title') -%>
     <%= f.text_field :tag_list, :class => 'larger' -%>
   </div>
   
@@ -66,7 +66,7 @@
   </div>
   <div id='more_options' style="display:none;">
     <div class="hemisquare">
-      <h3><%= t('admin.blog.submenu.categories.title') %></h3>
+      <h3><%= t('title', :scope => 'admin.blog.submenu.categories') %></h3>
       <ul class='blog_categories'>
         <% @blog_categories.each do |category| %>
           <li>
@@ -99,7 +99,7 @@
               :locals => {
                 :f => f,
                 :continue_editing => true,
-                :delete_title => t('admin.blog.posts.post.delete')
+                :delete_title => t('delete', :scope => 'admin.blog.posts.post')
               } %>
 <% end -%>
 

data/app/views/admin/blog/posts/_post.html.erb

@@ -1,7 +1,10 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(post) -%>">
   <span class='title'>
     <%= post.title %>
-    <span class="preview"><%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %><%= " by #{post.author.username}" if post.author.present? %></span>
+    <span class="preview">
+      <%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %>
+      <%= " by #{post.author.username}" if post.author.present? %>
+    </span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post),
@@ -13,6 +16,6 @@
         :class => "cancel confirm-delete",
         :title => t('.delete'),
         :method => :delete,
-        :confirm => t('shared.admin.delete.message', :title => post.title) %>
+        :confirm => t('message', :scope => 'shared.admin.delete', :title => post.title) %>
   </span>
 </li>

data/app/views/admin/blog/posts/_teaser_part.html.erb

@@ -2,9 +2,9 @@
   <%= f.text_area :custom_teaser, :rows => 20, :class => 'wymeditor widest' -%>
   <p>
     <span class='clearfix label_inline_with_link'>
-      <%= link_to t('admin.blog.posts.form.copy_body'), "#",
+      <%= link_to t('copy_body', :scope => 'admin.blog.posts.form'), "#",
                   :id => 'copy_body_link',
-                  :title => t('admin.blog.posts.form.copy_body_help') %>
+                  :title => t('copy_body_help', :scope => 'admin.blog.posts.form') %>
     </span>
   </p>
 </div>

data/app/views/admin/blog/posts/index.html.erb

@@ -1,14 +1,14 @@
 <%= render :partial => '/admin/blog/submenu' %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
+    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
     <% if @blog_posts.any? %>
     <ul>
       <%= render :partial => "post",
                  :collection => @blog_posts %>
     </ul>
     <% else %>
-      <p><%= t('shared.admin.search.no_results') %></p>
+      <p><%= t('no_results', :scope => 'shared.admin.search') %></p>
     <% end %>
   <% else %>
     <% if @blog_posts.any? %>
@@ -20,7 +20,7 @@
     <% else %>
       <p>
         <strong>
-          <%= t('.no_items_yet', :create => t('admin.blog.submenu.posts.new')) %>
+          <%= t('.no_items_yet', :create => t('new', :scope => 'admin.blog.submenu.posts')) %>
         </strong>
       </p>
     <% end %>

data/app/views/admin/blog/posts/uncategorized.html.erb

@@ -1,12 +1,12 @@
 <%= render :partial => '/admin/blog/submenu' %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
+    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
     <% if @blog_posts.any? %>
       <%= render :partial => "blog_posts",
                  :collection => @blog_posts %>
     <% else %>
-      <p><%= t('admin.search_no_results') %></p>
+      <p><%= t('search_no_results', :scope => 'admin') %></p>
     <% end %>
   <% else %>
     <% if @blog_posts.any? %>
@@ -18,7 +18,7 @@
     <% else %>
       <p>
         <strong>
-          <%= t('.no_items_yet', :create => t('admin.blog.submenu.posts.new')) %>
+          <%= t('.no_items_yet', :create => t('new', :scope => 'admin.blog.submenu.posts')) %>
         </strong>
       </p>
     <% end %>

data/app/views/blog/comment_mailer/notification.html.erb

@@ -1,17 +1,17 @@
-<%= t('.greeting') %>,
+<%=raw t('.greeting') %>,
 
-<%= t('.you_recieved_new_comment') %>
+<%=raw t('.you_recieved_new_comment') %>
 
-<%= t('.comment_starts') %>
+<%=raw t('.comment_starts') %>
 
-<%= t('.from') %>: <%= @comment.name %>
-<%= t('.email') %>: <%= @comment.email %>
-<%= t('.message') %>:
-<%= @comment.body %>
+<%=raw t('.from') %>: <%= @comment.name %>
+<%=raw t('.email') %>: <%= @comment.email %>
+<%=raw t('.message') %>:
+<%=simple_format strip_tags(@comment.body) %>
 
-<%= t('.comment_ends') %>
+<%=raw t('.comment_ends') %>
 
-<%= t('.closing_line') %>,
-<%= RefinerySetting[:site_name] %>
+<%=raw t('.closing_line') %>,
+<%=raw RefinerySetting[:site_name] %>
 
-<%= t('.ps') %>
+<%=raw t('.ps') %>

data/app/views/blog/posts/_comment.html.erb

@@ -3,8 +3,8 @@
   <%= simple_format auto_link(comment.message.to_s) %>
   <footer class='blog_comment_author'>
     <p>
-      <%= t('blog.posts.comments.by', :who => comment.name) %>,
-      <%= t('blog.posts.comments.time_ago', :time => time_ago_in_words(comment.created_at)) %>
+      <%= t('by', :scope => 'blog.posts.comments', :who => comment.name) %>,
+      <%= t('time_ago', :scope => 'blog.posts.comments', :time => time_ago_in_words(comment.created_at)) %>
     </p>
   </footer>
 </article>

data/app/views/blog/posts/_nav.html.erb

@@ -3,7 +3,7 @@
     <%= link_to (truncate(@blog_post.next.title) + " &#187;").html_safe, @blog_post.next, :class => 'next' %>
   <% end -%>
 
-  <%= link_to t('blog.posts.show.blog_home'), blog_root_path, :class => 'home' %>
+  <%= link_to t('blog_home', :scope => 'blog.posts.show'), blog_root_path, :class => 'home' %>
 
   <% if @blog_post.prev.present? -%>
     <%= link_to ("&#171; " + truncate(@blog_post.prev.title)).html_safe, @blog_post.prev, :class => 'prev' %>

data/app/views/blog/posts/_post.html.erb

@@ -8,11 +8,12 @@
     <h1><%= @blog_post.title %></h1>
     <section class='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><%= "#{t('blog.posts.show.by')} #{@blog_post.author.username}" if @blog_post.author.present? %>.
+        <%= t('created_at', :scope => 'blog.shared.posts', :when => l(@blog_post.published_at.to_date, :format => :short)) %>
+      </time>
+      <%= "#{t('by', :scope => 'blog.posts.show')} #{@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') %>
+          <%= t('filed_in', :scope => 'blog.posts.show') %>
           <% categories.each_with_index do |category, index| %>
             <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
           <% end %>

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

@@ -10,7 +10,7 @@
         <%= render :partial => "comment", :collection => comments %>
       <% else %>
         <p>
-          <%= t('blog.shared.comments.none') %>.
+          <%= t('none', :scope => 'blog.shared.comments') %>.
         </p>
       <% end %>
 

data/app/views/blog/shared/_post.html.erb

@@ -4,8 +4,9 @@
       <h1><%= link_to post.title, blog_post_url(post) %></h1>
       <section class='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><%= "#{t('blog.posts.show.by')} #{post.author.username}" if post.author.present? %>.
+          <%= t('created_at', :scope => 'blog.shared.posts', :when => l(post.published_at.to_date, :format => :short)) %>
+        </time>
+        <%= "#{t('by', :scope => 'blog.posts.show')} #{post.author.username}" if post.author.present? %>.
         <% if (categories = post.categories).any? %>
           <aside class='filed_in'>
             <%= t('filed_in', :scope => 'blog.posts.show') %>
@@ -21,18 +22,22 @@
       </section>
     </header>
     <section class='clearfix'>
-      <%= blog_post_teaser(post) %>
+      <% if blog_post_teaser_enabled? %>
+        <%= blog_post_teaser(post) %>
+      <% else %>
+        <%= post.body.html_safe %>
+      <% end %>
     </section>
     <footer>
       <p>
-        <%= link_to t('blog.shared.posts.read_more'), blog_post_url(post) %>
+        <%= link_to t('read_more', :scope => 'blog.shared.posts'), blog_post_url(post) if blog_post_teaser_enabled? %>
       </p>
       <aside class='comment_count'>
         <% if BlogPost.comments_allowed? %>
           <% if post.comments.any? %>
-             (<%= pluralize(post.comments.approved.count, t('blog.shared.comments.singular')) %>)
+             (<%= pluralize(post.comments.approved.count, t('singular', :scope => 'blog.shared.comments')) %>)
           <% else %>
-                (<%= t('blog.shared.comments.none') %>)
+                (<%= t('none', :scope => 'blog.shared.comments') %>)
           <% end %>
         <% end %>
       </aside>

data/changelog.md

@@ -1,13 +1,23 @@
-## 1.7 [UNRELEASED]
+## 1.7.0 [UNRELEASED]
+* Bulgarian translations [mirosr](https://github.com/mirosr)
+* posts/tagged... params[:tag_name] is optional [joemsak](https://github.com/joemsak)
+* Bug Fix on Categorization relationship: destroying a post produced error because no primary key existed on join table [joemsak](https://github.com/joemsak)
+* Bug fix on archive listing, don't include draft posts [jgrevich](https://github.com/jgrevich)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.2...1.7.0)
+
+## 1.6.2 [29 June 2011]
 * Custom teaser field to overwrite the automatic truncation of the body [wikyd](https://github.com/wikyd)
 * Tagging URL strategy updated again [joemsak](https://github.com/joemsak)
-
-## 1.6.2 [UNRELEASED]
 * Tagging bug fixed [ruprict](https://github.com/ruprict)
+* Refactored specs [parndt](https://github.com/parndt)
+* * [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6.1...1.6.2)
+
 
 ## 1.6.1 [21 June 2011]
 * Tagging URL strategy updated for reliability /blog/posts/tagged/ID-name-parameterized [joemsak](https://github.com/joemsak)
 * Heroku/PostgreSQL support for autocomplete tags [joemsak](https://github.com/joemsak)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.6...1.6.1)
+
 
 ## 1.6 [20 June 2011]
 * Category bug fixes and cleanup [wikyd](https://github.com/wikyd)
@@ -17,11 +27,14 @@
 * More testing [wakeless](https://github.com/wakeless)
 * Tag list autocomplete baked in [joemsak](https://github.com/joemsak)
 * Customize the URL of your blog post [wikyd](https://github.com/wikyd)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.5...1.6)
+
 
 ## 1.5 [28 May 2011]
 
 * Added Gravatar support. [parndt](https://github.com/parndt)
 * Added support for Refinery CMS 1.0.0 and above. [parndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.4...1.5)
 
 ## 1.4 [26 May 2011]
 
@@ -63,4 +76,4 @@
 * Rails 3 Support
 * Archives
 * Categories
-* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1)
+* [See full list](https://github.com/resolve/refinerycms-blog/compare/1.0...1.1)

data/config/locales/bg.yml

@@ -0,0 +1,158 @@
+bg:
+  plugins:
+    refinerycms_blog:
+      title: Блог
+  admin:
+    blog:
+      categories:
+        category:
+          edit: Редактиране на тази категория
+          delete: Изтриване на тази категория завинаги
+        index:
+          no_items_yet: 'Все още няма категории. Натиснете "%{create}", за да въведете нова.'
+      comments:
+        approved: 'Коментара от "%{author}" бе одобрен.'
+        comment:
+          view_live_html: 'Преглед на този коментар <br/><em>(ще се отвори се в нов прозорец)</em>'
+          read: Прочитане на този коментар
+          reject: Отхвърляне на този коментар
+          approve: Одобряване на този коментар
+        rejected: 'Коментара от "%{author}" бе отхвърлен.'
+        index:
+          no_items_yet: '%{type} коментари не бяха намерени.'
+        show:
+          comment: Коментар
+          blog_post: Публикация
+          from: Публикувано от
+          date: Публикувано на
+          message: Коментар
+          details: Детайли
+          age: Възраст
+          actions: Действия
+          back: Обратно към всички коментари
+          reject: Отхвърляне на този коментар
+          approve: Одобряване на този коментар
+      posts:
+        form:
+          advanced_options: Разширени настройки
+          toggle_advanced_options: Натиснете, за да достъпите настройките за етикета "meta" и менюто
+          save_as_draft: Запис като чернова
+          published_at: Дата на публикуване
+          custom_url: Уеб адрес по избор
+          custom_url_help: Вместо от заглавието, генерирайте уеб адреса за тази публикация чрез този текст.
+          copy_body: Копиране на съдържанието на публикацията като извадка
+          copy_body_help: Съдържанието на публикацията ще се копира като извадка. Оставете извадката празна и Refinery автоматично ще я сглоби.
+        index:
+          no_items_yet: 'Все още няма публикации. Натиснете "%{create}", за да въведете нова.'
+        uncategorized:
+          no_items_yet: 'Не съществуват некатегоризирани публикации.'
+        post:
+          view_live_html: 'Преглед на този публикация <br/><em>(ще се отвори се в нов прозорец)</em>'
+          edit: Редактиране на тази публикация
+          delete: Изтриване на тази публикация завинаги
+      settings:
+        notification_recipients:
+          value: Изпращане на уведомления до
+          explanation: 'Всеки път, когато някой коментира публикация, Refinery ще изпраща е-писмо, за да уведоми, че съществува нов коментар.'
+          hint: 'При добавяне на коментар, Refinery ще Ви уведоми по е-пощата.'
+          example: "Въведете адреса(ите) на Вашата е-поща. Например: jack@work.com, jill@office.com"
+          updated: 'Уведомления бяха изпратени до "%{recipients}"'
+      submenu:
+        categories:
+          title: Категории
+          manage: Управление
+          new: Добавяне на нова категория
+        comments:
+          title: Коментари
+          title_with_count: 'Коментари (%{new_count} нови)'
+          new: Нови
+          unmoderated: Нови
+          approved: Одобрени
+          rejected: Отхвърлени
+        posts:
+          title: Публикации
+          manage: Управление на публикации
+          new: Добавяне на нова публикация
+          uncategorized: Некатегоризирани публикации
+        settings:
+          title: Настройки
+          moderation: Модерация
+          update_notified: Получатели на уведомления
+          comments: Коментари
+  blog:
+    comment_mailer:
+      notification:
+        greeting: Здравейте
+        you_recieved_new_comment: Току що получихте нов коментар на Вашия уебсайт.
+        comment_starts: --- Начало на коментара ---
+        comment_ends: --- Край на коментара ---
+        from: От
+        email: Е-поща
+        message: Съобщение
+        closing_line: Поздрави
+        ps: 'П.П. Всички Ваши коментари се съхраняват от Refinery в секция "Блог" в подменю "Коментари" и могат да бъдат прегледани по-късно.'
+    shared:
+      categories:
+        title: Категории
+      rss_feed:
+        title: RSS хранилка
+        subscribe: Абониране
+      posts:
+        other: Други публикации
+        created_at: 'Публикувано на %{when}'
+        read_more: Цялата публикация
+      comments:
+        singular: коментар
+        none: няма коментари
+      archives: Архиви
+      tags:
+        title: "Етикети"
+    categories:
+      show:
+        no_posts: Тук все още няма публикации.
+    posts:
+      post:
+        filed_in: Категория
+      comment: коментар
+      comments:
+        by: 'Публикувано от %{who}'
+        time_ago: 'преди %{time}'
+        thank_you: 'Благодаря за Вашия коментар.'
+        thank_you_moderated: 'Благодаря за Вашия коментар. Съобщението Ви е в опашката за модерация и скоро ще бъде показано.'
+      index:
+        no_blog_articles_yet: Все още няма публикувани статии. Очаквайте скоро.
+      show:
+        blog_home: Обратно към началото на блога
+        comments:
+          title: Коментари
+          add: Вашият коментар
+        other: Други публикации
+        filed_in: Категория
+        tagged: Отбелязано с
+        submit: Изпращане на коментар
+        name: Име
+        email: Е-поща
+        message: Съобщение
+        by: от
+      tagged:
+        no_blog_articles_yet: Все още няма публикувани статии. Очаквайте скоро.
+        posts_tagged: Публикации отбелязани с
+      archive:
+        blog_archive_for: 'Архив на блога за %{date}'
+        no_blog_articles_posted: 'Все още няма публикувани статии за %{date}. Очаквайте скоро.'
+  activerecord:
+    models:
+      blog_category: Категория
+      blog_comment: Коментар
+      blog_post: Публикация
+    attributes:
+      blog_category:
+        title: Заглавие
+      blog_comment:
+        name: Име
+        email: Е-поща
+        message: Съобщение
+      blog_post:
+        title: Заглавие
+        body: Съдържание
+        teaser: Извадка