refinerycms 0.9.7.1 → 0.9.7.2

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

@@ -8,22 +8,21 @@ nl:
     menu:
       reorder_menu: Wijzig menu volgorde
       reorder_menu_done: Ik ben klaar met het wijzigen van de volgorde
-    log_out: Afmelden
     search: Zoek naar
     search_submit: Zoek
     search_results_for: "Zoekresultaten voor '{{query}}'"
-    no_results_found: "Excuses, geen resultaten gevonden"
+    search_no_results: "Excuses, geen resultaten gevonden"
   refinery:
     other: "Ander {{what}}"
     reorder: "Wijzig volgorde huidige {{what}}"
     reorder_done: "Klaar met wijzigen van de volgorde van {{what}}"
-    search_no_results: "Excuses, geen resultaten gevonden"
     crudify:
       created: "{{what}} is met success aangemaakt"
       updated: "{{what}} is met success aangepast"
       destroyed: "{{what}} is met success verwijderd"
   shared:
     site_bar:
+      log_out: Afmelden
       switch_to_your_website: Ga naar de website
       switch_to_your_website_editor: Ga terug naar de editor
     admin:

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

@@ -8,12 +8,14 @@ pt-BR:
     menu:
       reorder_menu: Reordenar menu
       reorder_menu_done: "Terminei de reordenar o menu"
-    log_out: Deslogar
     search: Procurar
     search_submit: Ir
     search_results_for: "Resultados da busca por '{{query}}'"
-    no_results_found: "Desculpe, nenhum resultado foi encontrado"
+    search_no_results: "Desculpe, nenhum resultado foi encontrado"
   refinery:
+    other: "Outras {{what}}"
+    reorder: "{{what}} Reordenar"
+    reorder_done: "Reordenação {{what}} feito"
     crudify:
       created: "{{what}} foi criado com sucesso"
       updated: "{{what}} foi atualizado com sucesso"
@@ -23,6 +25,10 @@ pt-BR:
       view_public_site: Ver site público
       welcome_to_refinery: Bem-vindo ao Refinery
   shared:
+    site_bar:
+      log_out: Deslogar
+      switch_to_your_website: Mudar para o seu website
+      switch_to_your_website_editor: Mudar para o editor do seu website
     admin:
       message:
         close: Fechar

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

@@ -8,11 +8,10 @@ sl:
     menu:
       reorder_menu: Spremeni vrsti red zavihkov
       reorder_menu_done: "Končaj s prerazporeditvijo zavihkov."
-    log_out: Odjavi se
     search: Išči
     search_submit: Pojdi
     search_results_for: Iskalni rezultati za {{query}}
-    no_results_found: "Oprostite, ni bilo zadetkov"
+    search_no_results: Oprostite! Ni bilo zadetkov.
     images:
       existing_image:
         submit_insert: Vstavi
@@ -20,13 +19,13 @@ sl:
     other: "Drugo {{what}}"
     reorder: "Spremeni vrstni red {{what}}"
     reorder_done: "Končaj s prerazporeditvijo {{what}}"
-    search_no_results: "Oprostite, ni bilo zadetkov"
     crudify:
       created: "{{what}} je bil uspešno ustvarjen"
       updated: "{{what}} je bil uspešno ustvarjen"
       destroyed: "{{what}} je bil uspešno odstranjen"
   shared:
     site_bar:
+      log_out: Odjavite se
       switch_to_your_website: "Preklopite na vašo spletno stran"
       switch_to_your_website_editor: "Preklopite na urejevalnik spletne strani"
     admin:
@@ -58,4 +57,3 @@ sl:
     message:
       close: Zapri
       close_this_message: Zapri to sporočilo
-      

data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb

@@ -23,7 +23,7 @@ class <%= migration_name %> < ActiveRecord::Migration
   end
 
   def self.down
-    UserPlugin.destroy_all({:title => "<%= class_name.pluralize.underscore.titleize %>"})
+    UserPlugin.destroy_all({:name => "<%= class_name.pluralize.underscore.titleize %>"})
 
     Page.find_all_by_link_url("/<%= plural_name %>").each do |page|
       page.link_url, page.menu_match = nil

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb

@@ -20,7 +20,7 @@
     <%% if @<%= plural_name %>.any? %>
       <%%= render :partial => "<%= singular_name %>", :collection => @<%= plural_name %> %>
     <%% else %>
-      <p><%%= t('.search_no_results') %></p>
+      <p><%%= t('admin.search_no_results') %></p>
     <%% end %>
   <%% else %>
     <%% if @<%= plural_name %>.any? %>

data/vendor/plugins/refinery/lib/refinery.rb

@@ -27,7 +27,7 @@ module Refinery
     MAJOR = 0
     MINOR = 9
     TINY = 7
-    BUILD = 1
+    BUILD = 2
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
 

data/vendor/plugins/refinery/lib/refinery/application_controller.rb

@@ -86,11 +86,11 @@ protected
     if ::Refinery::I18n.enabled?
       if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
         ::I18n.locale = locale
-      elsif locale.present? and ::Refinery::I18n.current_locale != ::I18n.default_locale
-        params[:locale] = I18n.locale = I18n.default_locale
+      elsif locale.present? and locale != ::Refinery::I18n.default_frontend_locale
+        params[:locale] = I18n.locale = ::Refinery::I18n.default_frontend_locale
         redirect_to(params, :message => "The locale '#{locale.to_s}' is not supported.") and return
       else
-        ::I18n.locale = ::Refinery::I18n.current_locale
+        ::I18n.locale = ::Refinery::I18n.default_frontend_locale
       end
     end
   end

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

@@ -15,7 +15,7 @@
   <% else %>
     <p>
       <% if searching? %>
-        <%= t('admin.no_results_found') %>
+        <%= t('admin.search_no_results') %>
       <% else %>
         <strong>
           <%= t('.empty_set') %>

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

@@ -18,7 +18,6 @@ sl:
         create_first: "Kliknite '{{link}}' da boste dodali vašo prvo nastavitev."
       form:
         restart_may_be_in_order: "<strong>Prosimo upoštevajte</strong> da boste morali včasih ponovno zagnati spletno stran, da bo nastavitev stopila v veljavo."
-    no_results_found: "Oprostite, ni bilo zadetkov"
   plugins:
     refinery_settings:
       title: Nastavitve

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

@@ -10,7 +10,7 @@
 </div>
 <div id='records' class='files'>
   <% if searching? %>
-    <h2><%= t('admin.search_results', :query => params[:search]) %></h2>
+    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
     <% if @resources.any? %>
         <%= render :partial => "resource", :collection => @resources %>
     <% else %>

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

@@ -20,8 +20,6 @@ da:
           title: Slet fil
       index:
         upload_new: Upload en fil
-        search_results: Søgeresultat
-        search_no_results: Desværre, din søgning gav ingen resultater.
         no_files_yet: Der er ingen filer endnu. Klik på "Upload fil" for at oprette den første.
       insert:
         existing_file: Eksisterende fil

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

@@ -22,11 +22,12 @@ en:
         upload_new: Upload New File
         no_files_yet: There are no files yet. Click "Upload New Files" to add your first file.
       insert:
-        existing_file: Existing File
+        existing: Existing File
         new: New File
-        link_to_resource: 'Link to this Resource'
         previous: Previous
         next: Next
-        submit_insert: Insert
         or: or
         cancel: Cancel
+      existing_resource:
+        link_to_resource: 'Link to this Resource'
+        submit_insert: Insert

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

@@ -20,8 +20,6 @@ es:
           title: Borrar este archivo completamente
       index:
         upload_new: Subir nuevo archivo
-        search_results: Resultados de la busqueda '{{results}}'
-        search_no_results: Disculpe no se encontro nada en la busqueda.
         no_files_yet: No hay archivos aun. Click "Subir nuevo archivo" para agregar tu primer archivo.
       insert:
         existing_file: Archivos existentes

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

@@ -20,8 +20,6 @@ fr:
           title: Supprimer ce fichier pour toujours
       index:
         upload_new: Télécharger un Nouveau Fichier
-        search_results: "Résultat de recherche pour '{{results}}'"
-        search_no_results: "Désolé, aucun résultat trouvé."
         no_files_yet: "Il n'y a pas encore de fichier. Cliquer 'Télécharger un Nouveau Fichier' pour ajouté votre premier fichier."
       insert:
         existing_file: Fichier existant

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

@@ -20,7 +20,6 @@ it:
           title: Rimuovere questo file per sempre
       index:
         upload_new: Upload File Nuovo
-        search_no_results: Nessun risultato per.
         no_files_yet: Non ci sono ancora i file. Fai clic su "Upload New File" per aggiungere il primo file.
       insert:
         existing_file:   File esistente

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

@@ -20,8 +20,6 @@ nb:
           title: Fjern denne filen for alltid
       index:
         upload_new: Last Opp Ny Fil
-        search_results: "Søkeresultat for '{{results}}'"
-        search_no_results: "Beklager, ingen resultat funnet."
         no_files_yet: Det er ingen filer her enda. Trykk "Last Opp Ny Fil" for å legge til din første fil.
       insert:
         existing_file: Eksisterende Fil

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

@@ -20,8 +20,6 @@ nl:
           title: Verwijder dit bestand permanent.
       index:
         upload_new: Upload een nieuw bestand.
-        search_results: Zoekresultaten voor '{{search_string}}'
-        search_no_results: Sorry, er zijn zoekresultaten gevonden.
         no_files_yet: Er zijn nog geen bestanden. Klik op "Upload een nieuw bestand" om uw eerste bestand toe te voegen.
       insert:
         existing_file: Bestaand bestand

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

@@ -20,8 +20,6 @@ pt-BR:
           title: Remover este arquivo para sempre
       index:
         upload_new: Enviar Novo Arquivo
-        search_results: Resultados da busca por '{{results}}'
-        search_no_results: Desculpe, nenhum resultado encontrado.
         no_files_yet: Ainda não existem arquivos. Clique em "Enviar Novo Arquivo" para adicionar seu primeiro arquivo.
       insert:
         existing_file: Arquivo Existente

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

@@ -20,8 +20,6 @@ sl:
           title: Odstrani datoteko
       index:
         upload_new: Prenesi Novo Datoteko
-        search_results: Iskalni rezultati za '{{results}}'
-        search_no_results: Oprostite! Ni bilo zadetkov.
         no_files_yet: Trenutno še ni nobene datoteke. Za prenos prve datoteke kliknite "Prenesi Novo Datoteko".
       insert:
         existing_file: Obstoječo Datoteko

data/vendor/plugins/translate/tasks/translate.rake

@@ -48,16 +48,24 @@ namespace :translate do
       locale_hash = locale_hash.deep_merge(yaml[locale.to_s])
     end
 
-    lookup_pattern = Translate::Keys.new.send(:i18n_lookup_pattern)
-    (Dir.glob(File.join("app", "**","*.{erb,rb,rhtml}")) + Dir.glob(File.join("vendor", "plugins", "**", "*.{erb,rb,rhtml}"))).each do |file_name|
-      next if file_name =~ /translate\/spec/
+    lookup_pattern = /\b(?:I18n\.t|I18n\.translate|t)(?:\s|\():?'([a-z0-9_]*.[a-z0-9_.]+)'\)?/
+    (Dir.glob(File.join("app", "**","*.{erb,rb}")) + Dir.glob(File.join("vendor", "plugins", "**", "app", "**", "*.{erb,rb}"))).each do |file_name|
       File.open(file_name, "r+").each do |line|
         line.scan(lookup_pattern) do |key_string|
-          result << "#{key_string} in \t  #{file_name} \t is not in any #{locale} locale file" unless key_exist?(key_string.first.split("."), locale_hash)
+          # qualify the namespace if beginning with . like t('.log_out')
+          if key_string.first =~ /^\./
+            namespace = file_name.gsub(/vendor\/plugins\/.+?\//, "").gsub(/^app\/(models|views|controllers|helpers)\//, '').split('/')
+            namespace = namespace | [namespace.pop.gsub(/^\_/, '').split('.').first]
+            key_string = ["#{namespace.join('.')}#{key_string.first}"]
+          end
+          
+          unless key_exist?(key_string.first.split("."), locale_hash)
+            result << "#{key_string} in \t  #{file_name} \t is not in any #{locale} locale file"
+          end
         end
-      end
+      end unless file_name =~ /translate\/spec/
     end
-    puts !result.empty? ? result.join("\n") : "No missing translations for locale: #{locale}"
+    puts result.empty? ? "No missing translations for locale: #{locale}" : "#{result.join("\n")}\n\nNumber of missing translations for #{locale}: #{result.length}"
   end
 
   desc "Show I18n keys that are missing in the specified locale YAML file. Defaults to I18n.default_locale, unless LOCALE env is specified"
@@ -68,17 +76,20 @@ namespace :translate do
 
   desc "Show I18n keys that are missing in all locale YAML files."
   task :lost_in_translation_all => :environment do
-    I18n.available_locales.each do |locale|
+    ::Refinery::I18n.locales.keys.each do |locale|
       find_missing_translations(locale)
+      puts "--"
     end
   end
 
-  def key_exist?(key_arr,locale_hash)
+  def key_exist?(key_arr, locale_hash)
     key = key_arr.slice!(0)
     if key
-      key_exist?(key_arr, locale_hash[key]) if (locale_hash && locale_hash.include?(key))
+      key_exist?(key_arr, locale_hash[key]) if locale_hash && locale_hash.include?(key)
     elsif locale_hash
       true
+    else
+      false
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  - 1
-  version: 0.9.7.1
+  - 2
+  version: 0.9.7.2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-03 00:00:00 +12:00
+date: 2010-07-06 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,6 @@ description: A beautiful open source Ruby on Rails content manager for small bus
 email: info@refinerycms.com
 executables: 
 - refinery
-- refinery-update-core
 extensions: []
 
 extra_rdoc_files: []
@@ -37,8 +36,8 @@ files:
 - Gemfile
 - Rakefile
 - changelog.md
-- readme.md
 - license.md
+- readme.md
 - todo.md
 - public/.htaccess
 - config.ru
@@ -47,7 +46,6 @@ files:
 - app/controllers/application_controller.rb
 - app/helpers/application_helper.rb
 - bin/refinery
-- bin/refinery-update-core
 - config/acts_as_indexed_config.rb
 - config/amazon_s3.yml.example
 - config/application.rb
@@ -852,11 +850,9 @@ files:
 - vendor/plugins/inquiries/app/views/admin/inquiries/show.html.erb
 - vendor/plugins/inquiries/app/views/admin/inquiries/spam.html.erb
 - vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb
-- vendor/plugins/inquiries/app/views/admin/inquiry_settings/_inquiry_setting.html.erb
 - vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb
 - vendor/plugins/inquiries/app/views/admin/inquiry_settings/_subject_form.html.erb
 - vendor/plugins/inquiries/app/views/admin/inquiry_settings/edit.html.erb
-- vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb
 - vendor/plugins/inquiries/app/views/inquiries/new.html.erb
 - vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb
 - vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb

data/bin/refinery-update-core

@@ -1,126 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
-refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
-rails_root = (defined?(RAILS_ROOT) ? RAILS_ROOT : ARGV.first)
-unless rails_root.nil? or rails_root.length == 0
-  # ensure asset directories exist.
-  dirs = [%w(public stylesheets), %w(public javascripts), %w(db migrate)]
-  FileUtils::makedirs dirs.map {|dir| File.join(rails_root, dir) }
-
-  # copy in the new assets.
-  assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(VERSION), %w(public images wymeditor skins refinery), %w(public images refinery), %w(public stylesheets wymeditor skins refinery), %w(public javascripts jquery)]
-  assets.each do |asset|
-    FileUtils::rm_rf File.join(rails_root, asset), :secure => true # ensure the destination is clear.
-    FileUtils::cp_r File.join(refinery_root, asset), File.join(rails_root, asset) # copy the new assets into the project.
-  end
-
-  # copy in any new migrations.
-  FileUtils::cp Dir[File.join(%W(#{refinery_root} db migrate *.rb))], File.join(%W(#{rails_root} db migrate))
-
-  # replace rakefile and gemfile.
-  FileUtils::cp File.join(%W(#{refinery_root} Rakefile)), File.join(%W(#{rails_root} Rakefile))
-  unless File.exist?(File.join("%W(#{rails_root} Gemfile)"))
-    FileUtils::cp File.join(%W(#{refinery_root} Gemfile)), File.join(%W(#{rails_root} Gemfile))
-  else
-    # TODO only override refinery gems here.
-  end
-
-  # read in the Gemfile and write it back out with the refinerycms gem enabled.
-  lines = File.open(File.join(%W(#{rails_root} Gemfile)), "r").read.split("\n")
-  lines.each do |line|
-    line.gsub!("#gem 'refinerycms'", "gem 'refinerycms'")
-  end
-  # write the new content into the file.
-  File.open(File.join(%W(#{rails_root} Gemfile)), "w").puts(lines.join("\n"))
-
-  # replace the preinitializer.
-  FileUtils::cp File.join(%W(#{refinery_root} config preinitializer.rb)), File.join(%W(#{rails_root} config preinitializer.rb))
-
-  # replace the boot file.
-  FileUtils::cp File.join(%W(#{refinery_root} config boot.rb)), File.join(%W(#{rails_root} config boot.rb))
-
-  # copy the lib/refinery directory in
-  FileUtils::cp_r File.join(%W(#{refinery_root} lib refinery)), File.join(rails_root, "lib")
-
-  # get current secret key
-  unless File.exist?(File.join(%W(#{rails_root} config application.rb)))
-    lines = File.open(File.join(%W(#{rails_root} config environment.rb)), "r").read.split("\n")
-  else
-    lines = File.open(File.join(%W(#{rails_root} config application.rb)), "r").read.split("\n")
-  end
-
-  secret_key = ""
-  lines.each do |line|
-    match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
-    secret_key = match unless match.nil?
-  end
-
-  # read in the config files
-  if File.exist?(File.join(%W(#{rails_root} config application.rb)))
-    FileUtils::cp File.join(%W(#{refinery_root} config environment.rb)), File.join(%W(#{rails_root} config environment.rb))
-  else
-    # write the new content into the file.
-    FileUtils::cp File.join(%W(#{refinery_root} config application.rb)), File.join(%W(#{rails_root} config application.rb))
-
-    app_rb_lines = File.open(File.join(%W(#{rails_root} config application.rb)), "r").read.split("\n")
-    app_rb_lines.each do |line|
-      match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
-      line.gsub!(match, secret_key) unless match.nil?
-    end
-
-    # write the new content into the file.
-    File.open(File.join(%W(#{rails_root} config application.rb)), "w").puts(app_rb_lines.join("\n"))
-
-    FileUtils::cp File.join(%W(#{refinery_root} config environment.rb)), File.join(%W(#{rails_root} config environment.rb))
-  end
-
-  unless File.exist?(File.join(%W(#{rails_root} config settings.rb)))
-    FileUtils::cp(File.join(%W(#{refinery_root} config settings.rb)), File.join(%W(#{rails_root} config settings.rb)))
-  end
-
-  app_config_file = "application.rb"
-
-  app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read
-
-  # copy new jquery javascripts.
-  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery.js)), File.join(%W(#{rails_root} public javascripts jquery.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery.js)))
-  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-min.js)), File.join(%W(#{rails_root} public javascripts jquery-min.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery-min.js)))
-  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-ui.js)), File.join(%W(#{rails_root} public javascripts jquery-ui.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery-ui.js)))
-  FileUtils.cp File.join(%W(#{refinery_root} public javascripts jquery-ui-custom-min.js)), File.join(%W(#{rails_root} public javascripts jquery-ui-custom-min.js)) if File.exist?(File.join(%W(#{refinery_root} public javascripts jquery-ui-custom-min.js)))
-
-  # backup app's config file and replace it, if required.
-  environment_updated = false
-  matcher = /(#===REFINERY REQUIRED GEMS===)(.+?)(#===REFINERY END OF REQUIRED GEMS===)/m
-  unless (app_refinery_gems_section = app_config.scan(matcher).join("")).length == 0
-    # backup the config file.
-    FileUtils.cp File.join(%W(#{rails_root} config #{app_config_file})), File.join(%W(#{rails_root} config #{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb))
-
-    # copy the new config file.
-    FileUtils.cp File.join(%W(#{refinery_root} config #{app_config_file})), File.join(%W(#{rails_root} config #{app_config_file}))
-
-    # Write the secret key back into the file.
-
-
-    environment_updated = true
-  end
-
-  unless ARGV.include?("--from-refinery-installer")
-    puts "---------"
-    puts "Copied new Refinery core assets."
-    if environment_updated
-      puts "I've made a backup of your current config/#{app_config_file} file as it has been updated with the latest Refinery requirements."
-      puts "The backup is located at config/#{app_config_file.gsub(".rb", "")}.autobackupbyrefinery.rb incase you need it."
-    end
-    puts ""
-    puts "=== ACTION REQUIRED ==="
-    puts "Please run 'rake db:migrate' to ensure your database is at the correct version."
-    puts "Please also run 'rake gems:install' to ensure you have the currently specified gems." if environment_updated
-    puts "It may also be necessary to run 'bundle install' in order to get the latest gems."
-    puts ""
-  end
-else
-  unless ARGV.include?("--from-refinery-installer")
-    puts "Please specify the path of the refinery project that you want to update, i.e. refinery-update-core /path/to/project"
-  end
-end