refinerycms-core 0.9.9.8 → 0.9.9.9

data/app/views/shared/_menu.html.erb

@@ -4,27 +4,29 @@
   hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) if hide_children.nil?
   # Select top menu items unless 'roots' is supplied.
   collection ||= @menu_pages.includes(:slugs)
-  if (roots ||= collection.select{|p| p.parent_id.nil?}).present?
-    # In order to match items that aren't shown in menu and highlight their associations.
-    # This can be supplied if the logic is different in your case.
-    unless defined?(selected_item)
-      selected_item = collection.detect{|page| selected_page?(page)}
-      selected_item = @page if selected_item.nil?
-    end
-    sibling_count = roots.length - 1
--%>
-    <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
-      <ul>
-        <%= render :partial => "/shared/menu_branch",
-                   :collection => roots,
-                   :locals => {
-                     :hide_children => hide_children,
-                     :sibling_count => sibling_count,
-                     :collection => collection,
-                     :selected_item => selected_item,
-                     :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
-                   }
-        -%>
-      </ul>
-    </nav>
+  caching = ((defined?(cache_menu) && cache_menu) || RefinerySetting.find_or_set(:cache_menu, false)) && File.writable?(Rails.cache.cache_path)
+  cache_if(caching, [Refinery.base_cache_key, "pages_menus", dom_id, Globalize.locale, request.path].join('_')) do
+    if (roots ||= collection.select{|p| p.parent_id.nil?}).present?
+      # In order to match items that aren't shown in menu and highlight their associations.
+      # This can be supplied if the logic is different in your case.
+      unless defined?(selected_item)
+        selected_item = collection.detect{|page| selected_page?(page)}
+        selected_item = @page if selected_item.nil?
+      end
+  -%>
+      <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
+        <ul>
+          <%= render :partial => "/shared/menu_branch",
+                     :collection => roots,
+                     :locals => {
+                       :hide_children => hide_children,
+                       :sibling_count => (roots.length - 1),
+                       :collection => collection,
+                       :selected_item => selected_item,
+                       :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
+                     }
+          -%>
+        </ul>
+      </nav>
+  <% end -%>
 <% end -%>

data/app/views/shared/_menu_branch.html.erb

@@ -5,7 +5,11 @@
   dom_id = ("id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
 
   hide_children = (defined?(hide_children) && hide_children)
-  children = (hide_children || !menu_branch.has_descendants?) ? [] : collection.select { |p| p.parent_id == menu_branch.id }
+  children = if (hide_children || !menu_branch.has_descendants?)
+    []
+  else
+    collection.select { |p| p.parent_id == menu_branch.id }
+  end
 -%>
 <li<%= ['', css, dom_id].compact.join(' ').gsub(/\ *$/, '') %>>
   <%= link_to menu_branch.title, menu_branch.url -%>

data/app/views/shared/_site_bar.html.erb

@@ -18,7 +18,8 @@
           <%= RefinerySetting.find_or_set(:site_name, 'Company Name') %>
         </span>
 
-        <%= link_to t('.log_out'), destroy_user_session_path, :id => 'logout' %>
+        <%= link_to t('.log_out', :locale => ::Refinery::I18n.current_locale),
+                    destroy_user_session_path, :id => 'logout' %>
       </div>
     </div>
   </div>

data/config/locales/jp.yml

@@ -0,0 +1,75 @@
+jp:
+  plugins:
+    refinery_core:
+      title: Refinery
+      description: Refineryのコアプラグイン
+    refinery_dialogs:
+      title: ダイアログ
+      description: Refineryのダイアログプラグイン
+  welcome:
+    there_are_no_users: あなたを最初のユーザとして登録します。
+    remember_admin_location: "Refineryの管理画面は"
+    lets_start: それでは始めましょう。
+    continue: 続く…
+  admin:
+    menu:
+      reorder_menu: メニューを並べ替える
+      reorder_menu_done: 並べ替えを終了
+    dialogs:
+      show:
+        save: セーブ
+        cancel: キャンセル
+  refinery:
+    crudify:
+      created: '%{what} を追加しました。'
+      updated: '%{what}を更新しました。'
+      destroyed: '%{what} を削除しました。'
+  shared:
+    site_bar:
+      log_out: ログアウト
+      switch_to_your_website: サイトに移行
+      switch_to_your_website_editor: サイトエディタに移行
+    admin:
+      continue_editing:
+        save_and_continue_editing: セーブして更に更新する
+      form_actions:
+        save: セーブ
+        cancel: キャンセル
+        cancel_lose_changes: セーブされていない更新が無くなってしまいますが宜しいですか。
+        delete: 削除
+        close: 閉じる
+      image_picker:
+        none_selected: '%{what}は選択されていません。ここをクリックして追加して下さい。'
+        remove_current: '選択されている%{what}を削除'
+        change: クリックして画像を選択
+        show: 表示
+      resource_picker:
+        download_current: このファイルをダウンロードする
+        opens_in_new_window: 新しいウィンドウで開く
+        remove_current: このファイルを削除する
+        no_resource_selected: ファイルが選択されていません。ここをクリックして選択して下さい。
+        name: ファイルを追加
+        current: 選択されているファイル
+      search:
+        button_text: 検索
+        results_for: '「%{query}」の検索結果'
+        no_results: 見つかりませんでした。
+      delete:
+        message: '「%{title}」を消します。宜しいですか。'
+      error_messages:
+        problems_in_following_fields: 以下のフィールドに問題がありました。
+      help: ヘルプ
+    message:
+      close: 閉じる
+      close_this_message: このメッセージを閉じる
+    draft_page_message:
+      not_live: このページはまだ公開されていません。
+    footer:
+      copyright: '著作権© %{year} %{site_name}'
+    no_script:
+      enable_javascript: このページを快適にお使いになるにはJavaScriptを有効にする必要があります。
+      here_are:
+      instructions_enable_javascript: お使いのブラウザでJavaScriptを有効にする方法はこちら
+  time:
+    formats:
+      short: "%A, %d %B %Y"

data/lib/refinery/application.rb

@@ -31,7 +31,7 @@ module Refinery
         base.config.filter_parameters += [:password, :password_confirmation]
 
         # Specify a cache store to use
-        base.config.cache_store = :file_store, File.join(Dir.tmpdir, base.name.to_s.gsub(':', File::SEPARATOR))
+        base.config.cache_store = :file_store, File.join(Dir.tmpdir, base.name.to_s.gsub(':', '-'))
 
         # Include the refinery controllers and helpers dynamically
         base.config.to_prepare do

data/lib/refinery/application_controller.rb

@@ -87,7 +87,7 @@ module Refinery
 
       # get all the pages to be displayed in the site menu.
       def find_pages_for_menu
-        @menu_pages = Page.live.in_menu.order('lft ASC')
+        @menu_pages = Page.in_menu.live.order('lft ASC')
       end
 
       # use a different model for the meta information.

data/lib/refinery/helpers/site_bar_helper.rb

@@ -4,13 +4,13 @@ module Refinery
 
       # Generates the link to determine where the site bar switch button returns to.
       def site_bar_switch_link
-        link_to_if(admin?, t('.switch_to_your_website'),
+        link_to_if(admin?, t('.switch_to_your_website', :locale => ::Refinery::I18n.current_locale),
                   (if session.keys.include?(:website_return_to) and session[:website_return_to].present?
                     session[:website_return_to]
                    else
                     root_path(:locale => (::Refinery::I18n.default_frontend_locale if defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?))
                    end)) do
-          link_to t('.switch_to_your_website_editor'),
+          link_to t('.switch_to_your_website_editor', :locale => ::Refinery::I18n.current_locale),
                   (if session.keys.include?(:refinery_return_to) and session[:refinery_return_to].present?
                     session[:refinery_return_to]
                    else

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.8}
+  s.version           = %q{0.9.9.9}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-03-11}
+  s.date              = %q{2011-03-15}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '~> 0.9.9.8'
-  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.8'
+  s.add_dependency 'refinerycms-base',            '~> 0.9.9.9'
+  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.9'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
@@ -87,6 +87,7 @@ Gem::Specification.new do |s|
     'config/locales/es.yml',
     'config/locales/fr.yml',
     'config/locales/it.yml',
+    'config/locales/jp.yml',
     'config/locales/lolcat.yml',
     'config/locales/lt.yml',
     'config/locales/lv.yml',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.8
+  version: 0.9.9.9
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +13:00
+date: 2011-03-15 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.8
+        version: 0.9.9.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.8
+        version: 0.9.9.9
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/it.yml
+- config/locales/jp.yml
 - config/locales/lolcat.yml
 - config/locales/lt.yml
 - config/locales/lv.yml