refinerycms 0.9.7.1 → 0.9.7.2

data/vendor/plugins/authentication/lib/authenticated_system.rb

@@ -119,7 +119,7 @@ module AuthenticatedSystem
     end
 
     def refinery_user?
-      logged_in? && current_user.roles.include?(Role.find_or_create_by_title('Refinery'))
+      logged_in? && current_user.has_role?(:refinery)
     end
 
     def self.included(base)

data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb

@@ -6,9 +6,15 @@ module Admin::DashboardHelper
       # work out which action occured
       action = record.updated_at.eql?(record.created_at) ? "created" : "updated"
 
+      # get article to define gender of model name, some languages require this for proper grammar
+      article = t("plugins.#{record.class.name.pluralize.downcase}.article", :default => 'the')
+
       # now create a link to the notification's corresponding record.
-      link_to "#{h(record.send(activity.title))} #{record.class.name.titleize.downcase} was #{action}",
-              eval("#{activity.url}(#{activity.nesting("record")}record)")
+      link_to t(".latest_activity_message",
+                :what => record.send(activity.title),
+                :kind => record.class.human_name,
+                :action => t("#{action}.with_article \"#{article}\"")
+               ).downcase.capitalize, eval("#{activity.url}(#{activity.nesting("record")}record)")
     end
   end
 

data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb

@@ -35,10 +35,17 @@
     </ul>
 
     <% if Refinery::I18n.enabled? %>
-      <h2><%= t('.change_language') %></h2>
-      <ul>
-        <% Refinery::I18n.locales.sort_by{|key, value| value }.each do |locale_key, locale_title| %>
-          <li<%= " class='selected'" if locale_key.to_sym == I18n.locale %>>
+      <% current_locale = ::Refinery::I18n.locales.detect{|key, value| key.to_sym == ::I18n.locale} -%>
+      <ul id='current_locale'>
+        <li>
+          <%= link_to "#{current_locale.last} <span>#{t('.change_language')}</span><span style='display:none;'>#{t('shared.admin.form_actions.cancel')}</span>".html_safe,
+                      "#",
+                      :style => "background-image: url('/images/refinery/icons/flags/#{current_locale.first}.png');" %>
+        </li>
+      </ul>
+      <ul id='other_locales' style='display: none'>
+        <% Refinery::I18n.locales.reject{|key, value| key.to_sym == ::I18n.locale}.sort_by{|key, value| value}.each do |locale_key, locale_title| %>
+          <li>
             <%= link_to locale_title,
                         params.dup.tap { |p| p[:set_locale] = locale_key },  # Use the current params, just change the locale
                         :style => "background-image: url('/images/refinery/icons/flags/#{locale_key}.png');" %>

data/vendor/plugins/dashboard/config/locales/da.yml

@@ -16,7 +16,9 @@ da:
         see: Vis '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: opdateret
-  created: oprettet
+  updated:
+    'with_article "the"':  opdateret
+  created:
+    'with_article "the"':  oprettet
   ago: "{{time}} siden"
   see: Vis

data/vendor/plugins/dashboard/config/locales/de.yml

@@ -16,7 +16,9 @@ de:
         see: "'{{what}}' ansehen"
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: aktualisiert
-  created: erstellt
+  updated:
+    'with_article "the"':  aktualisiert
+  created:
+    'with_article "the"':  erstellt
   ago: "vor {{time}}"
   see: Ansehen

data/vendor/plugins/dashboard/config/locales/en.yml

@@ -9,14 +9,19 @@ en:
         add_a_new_page: Add a new page
         update_a_page: Update a page
         upload_a_image: Upload a image
+        upload_a_file: Upload a file
         change_language: Change Language
         see_home_page: See home page
       recent_activity:
         latest_activity: Latest activity
         see: "See '{{what}}'"
+        latest_activity_message: "{{what}} {{kind}} was {{action}}"
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: updated
-  created: created
+  updated:
+    'with_article "the"': updated
+  created:
+    'with_article "the"': created
+
   ago: "{{time}} ago"
   see: See

data/vendor/plugins/dashboard/config/locales/es.yml

@@ -16,7 +16,13 @@ es:
         see: Vee '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: actualizado
-  created: creado
+  updated:
+    'with_article "las"':  actualizadas
+    'with_article "los"':  actualizado
+    'with_article "the"':  actualizado
+  created:
+    'with_article "las"':  creadas
+    'with_article "los"':  creados
+    'with_article "the"':  creado
   ago: "hace {{time}}"
   see: Ver

data/vendor/plugins/dashboard/config/locales/fr.yml

@@ -16,7 +16,9 @@ fr:
         see: Voir '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: a été mis à jour
-  created: a été créer
+  updated:
+    'with_article "the"':  a été mis à jour
+  created:
+    'with_article "the"':  a été créer
   ago: "Il y a {{time}}"
   see: Voir

data/vendor/plugins/dashboard/config/locales/it.yml

@@ -16,7 +16,9 @@ it:
         see: Vedere '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: aggiornato
-  created: creato
+  updated:
+    'with_article "the"':  aggiornato
+  created:
+    'with_article "the"':  creato
   ago: "{{time}} fa"
   see: Vedere

data/vendor/plugins/dashboard/config/locales/nb.yml

@@ -16,7 +16,9 @@ nb:
         see: Se '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: oppdatert
-  created: opprettet
+  updated:
+    'with_article "the"':  oppdatert
+  created:
+    'with_article "the"': opprettet
   ago: "{{time}} siden"
   see: Se

data/vendor/plugins/dashboard/config/locales/nl.yml

@@ -16,7 +16,9 @@ nl:
         see: Bezoek de '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: bewerkt
-  created: aangemaakt
+  updated:
+    'with_article "the"':  bewerkt
+  created:
+    'with_article "the"':  aangemaakt
   ago: "{{time}} geleden"
   see: Zie

data/vendor/plugins/dashboard/config/locales/pt-BR.yml

@@ -13,10 +13,17 @@ pt-BR:
         change_language: Mudar Língua
       recent_activity:
         latest_activity: Atividade Recente
-        see: Ver '{{what}}'
+        see: "Ver '{{what}}'"
+        latest_activity_message: "{{kind}} {{what}} foi {{action}}"
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: atualizado
-  created: criado
+  updated:
+    'with_article "as"': atualizada
+    'with_article "os"': atualizado
+    'with_article "the"': atualizado
+  created:
+    'with_article "as"': criada
+    'with_article "os"': criado
+    'with_article "the"': criado
   ago: "{{time}} atrás"
   see: Ver

data/vendor/plugins/dashboard/config/locales/sl.yml

@@ -16,7 +16,9 @@ sl:
         see: Poglej '{{what}}'
       recent_inquiries:
         latest_inquiries: Latest inquiries
-  updated: posodobitev
-  created: ustvarjena
+  updated:
+    'with_article "the"':  posodobitev
+  created:
+    'with_article "the"':  ustvarjena
   ago: "{{time}} nazaj"
   see: Poglej

data/vendor/plugins/i18n/lib/i18n.rb

@@ -1,14 +1,14 @@
 class Refinery::I18n
   class << self
 
-    attr_accessor :enabled, :current_locale, :locales, :default_locale
+    attr_accessor :enabled, :current_locale, :locales, :default_locale, :default_frontend_locale
 
     def enabled?
       # cache this lookup as it gets very expensive.
       if defined?(@enabled) && !@enabled.nil?
         @enabled
       else
-        @enabled = RefinerySetting.find_or_set(:i18n_translation_enabled, false, {
+        @enabled = RefinerySetting.find_or_set(:i18n_translation_enabled, true, {
           :callback_proc_as_string => %q{::Refinery::I18n.setup!},
           :scoping => 'refinery'
         })
@@ -17,9 +17,10 @@ class Refinery::I18n
 
     def current_locale
       unless enabled?
-        ::Refinery::I18n.current_locale = :en
+        ::Refinery::I18n.current_locale = ::Refinery::I18n.default_locale
       else
-        @current_locale ||= RefinerySetting.find_or_set(:i18n_translation_current_locale, I18n.default_locale, {
+        @current_locale ||= RefinerySetting.find_or_set(:i18n_translation_current_locale,
+          ::Refinery::I18n.default_locale, {
           :scoping => 'refinery',
           :callback_proc_as_string => %q{::Refinery::I18n.setup!}
         })
@@ -36,6 +37,22 @@ class Refinery::I18n
       ::I18n.locale = locale.to_sym
     end
 
+    def default_locale
+      @default_locale ||= RefinerySetting.find_or_set(:i18n_translation_default_locale,
+        :en, {
+        :callback_proc_as_string => %q{::Refinery::I18n.setup!},
+        :scoping => 'refinery'
+      })
+    end
+
+    def default_frontend_locale
+      @default_frontend_locale ||= RefinerySetting.find_or_set(:i18n_translation_default_frontend_locale,
+      :en, {
+        :scoping => 'refinery',
+        :callback_proc_as_string => %q{::Refinery::I18n.setup!}
+      })
+    end
+
     def locales
       @locales ||= RefinerySetting.find_or_set(:i18n_translation_locales, {
           :en => 'English',
@@ -64,6 +81,9 @@ class Refinery::I18n
       # Re-initialize variables.
       @enabled = nil
       @locales = nil
+      @default_locale = nil
+      @default_frontend_locale = nil
+      @current_locale = nil
 
       self.load_base_locales!
       self.load_refinery_locales!
@@ -71,9 +91,9 @@ class Refinery::I18n
       self.set_default_locale!
 
       # Mislav trick to fallback to default for missing translations
-      I18n.exception_handler = lambda do |e, locale, key, options|
-        if I18n::MissingTranslationData === e and locale != I18n.default_locale
-          I18n.translate(key, (options || {}).update(:locale => I18n.default_locale, :raise => true))
+      ::I18n.exception_handler = lambda do |e, locale, key, options|
+        if ::I18n::MissingTranslationData === e and locale != ::Refinery::I18n.default_locale
+          ::I18n.translate(key, (options || {}).update(:locale => ::Refinery::I18n.default_locale, :raise => true))
         else
           raise e
         end
@@ -93,17 +113,14 @@ class Refinery::I18n
     end
 
     def set_default_locale!
-      I18n.default_locale = @default_locale ||= RefinerySetting.find_or_set(:i18n_translation_default_locale, :en, {
-        :callback_proc_as_string => %q{::Refinery::I18n.setup!},
-        :scoping => 'refinery'
-      })
+      ::I18n.default_locale = ::Refinery::I18n.default_locale
     end
 
     def load_locales(locale_files)
       locale_files = locale_files.to_s if locale_files.is_a? Pathname
       locale_files = Dir[locale_files] if locale_files.is_a? String
       locale_files.each do |locale_file|
-        I18n.load_path.unshift locale_file
+        ::I18n.load_path.unshift locale_file
       end
     end
 
@@ -111,5 +128,5 @@ class Refinery::I18n
 end
 
 if RefinerySetting.table_exists?
-  Refinery::I18n.setup!
+  ::Refinery::I18n.setup!
 end

data/vendor/plugins/i18n/lib/i18n_filter.rb

@@ -5,7 +5,7 @@ module RoutingFilter
       if ::Refinery::I18n.enabled?
         locale = nil
         if path =~ %r{^\/#{::Refinery::I18n.locales.keys.join('|')}\/}
-          if path !~ %r{^/(admin|refinery|wymiframe)}
+          if path !~ %r{^/(sessions?|admin|refinery|wymiframe)}
             path.sub! %r(^/(([a-zA-Z\-_])*)(?=/|$)) do
               locale = $1
               ::I18n.locale = locale
@@ -13,12 +13,12 @@ module RoutingFilter
             end
           end
         else
-          ::I18n.locale = ::Refinery::I18n.current_locale
+          ::I18n.locale = ::Refinery::I18n.default_frontend_locale
         end
 
         returning yield do |params|
-          unless path =~ %r{^/(admin|refinery|wymiframe)} or ::I18n.locale == ::Refinery::I18n.default_locale
-            params[:locale] = (locale.presence || ::Refinery::I18n.current_locale)
+          unless path =~ %r{^/(admin|refinery|wymiframe)} or ::I18n.locale == ::Refinery::I18n.default_frontend_locale
+            params[:locale] = (locale.presence || ::Refinery::I18n.current_frontend_locale)
           end
         end
       else
@@ -32,7 +32,7 @@ module RoutingFilter
       if ::Refinery::I18n.enabled?
         locale = args.extract_options!.delete(:locale) || ::I18n.locale
         returning yield do |result|
-          if (locale != ::Refinery::I18n.default_locale and result !~ %r{^/(refinery|wymiframe)})
+          if (locale != ::Refinery::I18n.default_frontend_locale and result !~ %r{^/(refinery|wymiframe)})
             result.sub!(%r(^(http.?://[^/]*)?(.*))){ "#{$1}/#{locale}#{$2}" }
           end
           result

data/vendor/plugins/images/app/views/admin/images/index.html.erb

@@ -21,7 +21,7 @@
     <% if @images.any? %>
       <%= render :partial => "#{current_image_view}_view" %>
     <% else %>
-      <p><%= t('admin.no_results_found') %></p>
+      <p><%= t('admin.search_no_results') %></p>
     <% end %>
   <% else %>
     <% if @images.any? %>

data/vendor/plugins/images/config/locales/es.yml

@@ -2,9 +2,9 @@ es:
   plugins:
     refinery_images:
       title: Imágenes
-      
   no_file_chosen: Debe elegir un fiechero para cargar.
-  file_should_be_smaller_then_50mb: Los ficheros deben tener un tamaño menor que 50Mb
+  file_should_be_smaller_than_max_image_size: Los ficheros deben ser menores de {{max_image_size}} de tamaño
+  file_must_be_these_formats: Su imagen debe ser un archivo JPG, PNG o GIF
   admin:
     images:
       form:
@@ -21,19 +21,16 @@ es:
           switch_to: Cambiar a vista de {{view_name}}
           list: lista
           grid: mosaico
-        search:
-          results_for: Resultados de la búsqueda '''{{query}}'''
-          no_results_found: No se han encontrado resultados
       grid_view:
         click_to_view: "Pulse para ver '{{title}}'<br/><em>Abre una nueva ventana</em>"
         edit: Editar esta imagen
         confirm_delete:
-          message: "¿Esta seguro de que desea eliminar la imagen ''{{title}}''?" 
+          message: "¿Esta seguro de que desea eliminar la imagen ''{{title}}''?"
           title: Borrar esta imagen
       list_view_image:
         edit_this_image: Editar esta imagen
         delete:
-          message: "¿Esta seguro de que desea eliminar la imagen ''{{title}}''?" 
+          message: "¿Esta seguro de que desea eliminar la imagen ''{{title}}''?"
           title: Borrar esta imagen
       insert:
         existing_image: Imagen existente

data/vendor/plugins/images/config/locales/pt-BR.yml

@@ -6,6 +6,7 @@ pt-BR:
       title: Imagens
   no_file_chosen: Você deve escolher um arquivo para enviar
   file_should_be_smaller_than_max_image_size: Arquivos devem possuir menos de {{max_image_size}} de tamanho
+  file_must_be_these_formats: Sua imagem deve ser uma JPG, PNG ou GIF
   admin:
     images:
       form:
@@ -16,7 +17,6 @@ pt-BR:
         current_image: Imagem atual
         maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
       index:
-        no_results_found: Desculpe, nenhum resultado encontrado.
         create_new_image: Criar Nova Imagem
         no_images_yet: Ainda não existem imagens.<br/> Clique em "Criar Nova Imagem" para adicionar sua primeira imagem.
         view:

data/vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb

@@ -2,9 +2,14 @@ class Admin::InquirySettingsController < Admin::BaseController
 
   crudify :inquiry_setting, :title_attribute => "name", :order => 'name ASC', :redirect_to_url => "admin_inquiries_url"
 
+  before_filter :redirect_back_to_inquiries?, :only => [:index]
   before_filter :set_url_override?, :only => [:edit]
 
 protected
+  def redirect_back_to_inquiries?
+    redirect_to admin_inquiries_url
+  end
+
   def set_url_override?
     @url_override = admin_inquiry_setting_url(@inquiry_setting, :dialog => from_dialog?)
   end

data/vendor/plugins/inquiries/config/locales/da.yml

@@ -31,9 +31,7 @@ da:
         closed: "Henvendelsen '{{inquiry}}' er lukket"
         reopened: "Henvendelsen '{{inquiry}}' er genåbnet"
       index:
-        update_notified: Opdatér, hvem der får besked
-        edit_confirmation_email: Redigér e-mailbekræftelse
-        search_results_for: Søgeresultat for '{{query}}'
+        search_results_for: "Søgeresultat for '{{query}}'"
         no_inquiries: Du har endnu ikke modtaget nogen henvendelser.
       show:
         details: Detaljer
@@ -45,6 +43,9 @@ da:
         actions: Handlinger
         back_to_all_inquiries: Tilbage til alle henvendelser
         inquiry: Henvendelse
+      submenu: 
+        update_notified: Opdatér, hvem der får besked
+        edit_confirmation_email: Redigér e-mailbekræftelse
     inquiry_settings:
       update:
         updated: "'{{setting}}' er opdateret."

data/vendor/plugins/inquiries/config/locales/de.yml

@@ -31,8 +31,6 @@ de:
         closed: "Kontaktanfrage '{{inquiry}}' ist geschlossen"
         reopened: "Kontaktanfrage '{{inquiry}}' ist neu geöffnet"
       index:
-        update_notified: Wer wird benachrichtigt aktualisieren
-        edit_confirmation_email: Bestätigungsmail bearbeiten
         search_results_for: Suchergebnisse für {{query}}
         open_inquiries: Offene Anfragen
         no_inquiries: "Juhuu! Es gibt keine offenen Kontaktanfragen, da Sie bereits alle Anfragen abgearbeitet haben."
@@ -48,6 +46,9 @@ de:
         actions: Aktionen
         back_to_all_inquiries: Zurück zu allen Kontaktanfragen
         inquiry: Kontaktanfrage
+      submenu:        
+        update_notified: Wer wird benachrichtigt aktualisieren
+        edit_confirmation_email: Bestätigungsmail bearbeiten
     inquiry_settings:
       update:
         updated: "'{{setting}}' wurde erfolgreich aktualisiert."