refinerycms 0.9.7.14 → 0.9.7.15

data/vendor/plugins/i18n/lib/routing_filter/README.markdown

@@ -22,7 +22,7 @@ The following would be a sceleton of an empty filter:
           # Alter the path here before it gets recognized. 
           # Make sure to yield (calls the next around filter if present and 
           # eventually `recognize_path` on the routeset):
-          returning yield do |params|
+          yield.tap do |params|
             # You can additionally modify the params here before they get passed
             # to the controller.
           end
@@ -32,7 +32,7 @@ The following would be a sceleton of an empty filter:
           # Alter arguments here before they are passed to `url_for`. 
           # Make sure to yield (calls the next around filter if present and 
           # eventually `url_for` on the controller):
-          returning yield do |result|
+          yield.tap do |result|
             # You can change the generated url_or_path here. Make sure to use
             # one of the "in-place" modifying String methods though (like sub! 
             # and friends).

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

@@ -47,7 +47,7 @@ ActionController::Routing::RouteSet::NamedRouteCollection.class_eval do
     if match = code.match(%r(^return (.*) if (.*)))
       # returned string must not contain newlines, or we'll spill out of inline code comments in
       # ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper
-      "returning(#{match[1]}) { |result|" +
+      "#{match[1]}.tap { |result|" +
       "  ActionController::Routing::Routes.filters.run_reverse(:around_generate, *args, &lambda{ result }) " +
       "} if #{match[2]}"
     end
@@ -85,7 +85,7 @@ ActionController::Routing::RouteSet.class_eval do
   # TODO move this ... where?
   alias_method :extract_request_environment_without_host, :extract_request_environment unless method_defined? :extract_request_environment_without_host
   def extract_request_environment(request)
-    returning extract_request_environment_without_host(request) do |env|
+    extract_request_environment_without_host(request).tap do |env|
       env.merge! :host => request.host,
                  :port => request.port,
                  :host_with_port => request.host_with_port,

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

@@ -16,7 +16,7 @@ module RoutingFilter
     end
 
     def around_generate(*args, &block)
-      returning yield do |result|
+      yield.tap do |result|
         url = result.is_a?(Array) ? result.first : result
         append_extension!(url) if append_extension?(url)
       end

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

@@ -4,14 +4,14 @@ module RoutingFilter
   class Pagination < Base
     def around_recognize(path, env, &block)
       page = extract_page!(path)
-      returning yield(path, env) do |params|
+      yield.tap(path, env) do |params|
         params[:page] = page.to_i if page
       end
     end
 
     def around_generate(*args, &block)
       page = args.extract_options!.delete(:page)
-      returning yield do |result|
+      yield.tap do |result|
         if page && page != 1
           url = result.is_a?(Array) ? result.first : result
           append_page!(url, page)

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

@@ -47,7 +47,7 @@ module RoutingFilter
 
     def around_recognize(path, env, &block)
       token = extract_token!(path)                              # remove the token from the beginning of the path
-      returning yield do |params|                               # invoke the given block (calls more filters and finally routing)
+      yield.tap do |params|                               # invoke the given block (calls more filters and finally routing)
         params[:uuid_token] = token if token                    # set recognized token to the resulting params hash
       end
     end
@@ -56,7 +56,7 @@ module RoutingFilter
       token = args.extract_options!.delete(:uuid_token)         # extract the passed :token option
       token = AccessToken.current if AccessToken && token.nil?  # default to AccessToken.current when token is nil (could also be false)
 
-      returning yield do |result|
+      yield.tap do |result|
         if token
           url = result.is_a?(Array) ? result.first : result
           prepend_token!(url, token)

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

@@ -3,13 +3,13 @@ da:
     refinery_images:
       title: Billeder
   no_file_chosen: Du skal vælge et billede, der skal uploades
-  file_should_be_smaller_than_max_image_size: Filer må højest være på {{max_image_size}}
+  file_should_be_smaller_than_max_image_size: Filer må højest være på %{max_image_size}
   file_must_be_these_formats: Dit billede skal være enten JPG, PNG eller GIF format
   admin:
     images:
       image:
         delete:
-          message: Er du sikker på du vil slette billedet '{{title}}'? 
+          message: Er du sikker på du vil slette billedet '%{title}'? 
           title: Slet billede
       form:
         image: Billede
@@ -17,16 +17,16 @@ da:
         or: eller
         replace_image: " erstat med dette..."
         current_image: Nuværende billede
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "The maximum image size is %{megabytes} megabytes."
       index:
         create_new_image: Upload et billede
         no_images_yet: Der er ingen billeder endnu. Klik "Upload et billede" for at oprette det første.
         view:
-          switch_to: Skift til {{view_name}}visning
+          switch_to: Skift til %{view_name}visning
           list: liste
           grid: gitter
         search:
-          results_for: Søgeresultat for '{{query}}'
+          results_for: Søgeresultat for '%{query}'
       grid_view:
         edit: Redigér billede
         view_live: Vis billede<br/><em>(åbner i nyt vindue)</em>

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

@@ -3,13 +3,13 @@ de:
     refinery_images:
       title: Bilder
   no_file_chosen: Sie müssen eine Datei zum Hochladen wählen.
-  file_should_be_smaller_than_max_image_size: Dateien sollten kleiner als {{max_image_size}} sein
+  file_should_be_smaller_than_max_image_size: Dateien sollten kleiner als %{max_image_size} sein
   file_must_be_these_formats: Ihr Bild muss im Format JPG, PNG oder GIF vorliegen
   admin:
     images:
       image:
         delete:
-          message: Sind Sie sicher, dass Sie '{{title}}' löschen möchten?
+          message: Sind Sie sicher, dass Sie '%{title}' löschen möchten?
           title: Dieses Bild für immer löschen
       form:
         image: Bild
@@ -17,16 +17,16 @@ de:
         or: oder
         replace_image: Oder durch dieses ersetzen ...
         current_image: Aktuelles Bild
-        maximum_image_size: "Die maximale Bildgröße beträgt {{megabytes}} Megabyte."
+        maximum_image_size: "Die maximale Bildgröße beträgt %{megabytes} Megabyte."
       index:
         create_new_image: Neues Bild erstellen
         no_images_yet: Es wurden noch keine Bilder erstellt. Klicken Sie auf "Neues Bild erstellen" um Ihr erstes Bild zu erstellen.
         view:
-          switch_to: Zur Ansicht "{{view_name}}" wechseln
+          switch_to: Zur Ansicht "%{view_name}" wechseln
           list: Liste
           grid: Gitter
         search:
-          results_for: Suchergebnisse für {{query}}
+          results_for: Suchergebnisse für %{query}
       grid_view:
         edit: Dieses Bild bearbeiten
         view_live: Dieses Bild anzeigen <br/><em>Öffnet ein neues Fenster</em>

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

@@ -3,13 +3,13 @@ en:
     refinery_images:
       title: Images
   no_file_chosen: You must choose a file to upload
-  file_should_be_smaller_than_max_image_size: Files should be smaller than {{max_image_size}} in size
+  file_should_be_smaller_than_max_image_size: Files should be smaller than %{max_image_size} in size
   file_must_be_these_formats: Your image must be either a JPG, PNG or GIF
   admin:
     images:
       image:
         delete:
-          message: Are you sure you want to delete '{{title}}'?
+          message: Are you sure you want to delete '%{title}'?
           title: Remove this image forever
       form:
         image: Image
@@ -17,16 +17,16 @@ en:
         or: or
         replace_image: Replace it with this one ...
         current_image: Current Image
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "The maximum image size is %{megabytes} megabytes."
       index:
         create_new_image: Create New Image
         no_images_yet: There are no images yet.  Click "Create New Image" to add your first image.
         view:
-          switch_to: Switch to {{view_name}} view
+          switch_to: Switch to %{view_name} view
           list: list
           grid: grid
         search:
-          results_for: Search results for {{query}}
+          results_for: Search results for %{query}
       grid_view:
         edit: Edit this image
         view_live: View this image <br/><em>Opens in a new window</em>

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

@@ -3,13 +3,13 @@ es:
     refinery_images:
       title: Imágenes
   no_file_chosen: Debe elegir un fiechero para cargar.
-  file_should_be_smaller_than_max_image_size: Los ficheros deben ser menores de {{max_image_size}} de tamaño
+  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:
       image:
         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
       form:
         image: Imagen
@@ -17,16 +17,16 @@ es:
         or: o
         replace_image: Reemplazar imagen con esta otra...
         current_image: Imagen actual
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "The maximum image size is %{megabytes} megabytes."
       index:
         create_new_image: Crear Imagen nueva
         no_images_yet: No hay ninguna imagen. Pulse en "Crear Imagen nueva" para añadir su primera imagen.
         view:
-          switch_to: Cambiar a vista de {{view_name}}
+          switch_to: Cambiar a vista de %{view_name}
           list: lista
           grid: mosaico
       grid_view:
-        click_to_view: "Pulse para ver '{{title}}'<br/><em>Abre una nueva ventana</em>"
+        click_to_view: "Pulse para ver '%{title}'<br/><em>Abre una nueva ventana</em>"
         edit: Editar esta imagen
       list_view_image:
         edit_this_image: Editar esta imagen

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

@@ -3,13 +3,13 @@ fr:
     refinery_images:
       title: Images
   no_file_chosen: Vous devez choisir un image à télécharger
-  file_should_be_smaller_than_max_image_size: Le poid des fichiers doit être plus petit que {{max_image_size}}
+  file_should_be_smaller_than_max_image_size: Le poid des fichiers doit être plus petit que %{max_image_size}
   file_must_be_these_formats: "Votre image doit être un fichier JPG, PNG ou GIF"
   admin:
     images:
       image:
         delete:
-          message: "Êtes vous sûr de vouloir supprimer '{{title}}'?"
+          message: "Êtes vous sûr de vouloir supprimer '%{title}'?"
           title: Supprimer cette image pour toujours
       form:
         image: Image
@@ -17,16 +17,16 @@ fr:
         or: ou
         replace_image: La replacer par celle-ci...
         current_image: Image actuel
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "The maximum image size is %{megabytes} megabytes."
       index:
         create_new_image: Créer un Nouvelle Image
         no_images_yet: Il n'y a pas encore d'image. Cliquer "Créer une Nouvelle Image" pour ajouté votre première image.
         view:
-          switch_to: Changé pour la vue {{view_name}}
+          switch_to: Changé pour la vue %{view_name}
           list: liste
           grid: grille
         search:
-          results_for: "Résultat de recherche pour '{{query}}'"
+          results_for: "Résultat de recherche pour '%{query}'"
       grid_view:
         edit: Modifier cette image
         view_live: Voir cette image <br/><em>Ouvre dans une nouvelle fenêtre</em>

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

@@ -3,13 +3,13 @@ it:
     refinery_images:
       title: Immagine
   no_file_chosen: Devi scegliere un file da caricare
-  file_should_be_smaller_than_max_image_size: I file devono essere inferiori a {{max_image_size}} nel formato
+  file_should_be_smaller_than_max_image_size: I file devono essere inferiori a %{max_image_size} nel formato
   file_must_be_these_formats: L'immagine deve essere un JPG, PNG or GIF
   admin:
     images:
       image:
         delete:
-          message: Sei sicuro di voler eliminare '{{title}}'?
+          message: Sei sicuro di voler eliminare '%{title}'?
           title: Eliminare questa immagine per sempre
       form:
         image: Immagine
@@ -17,12 +17,12 @@ it:
         or: o
         replace_image: Sostituirlo con questo ...
         current_image: Immagine corrente
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "The maximum image size is %{megabytes} megabytes."
       index:
         create_new_image: Crea nuova immagine
         no_images_yet: Non ci sono immagini ancora. Fare clic su "Crea nuova immagine" per aggiungere la vostra prima immagine.
         view:
-          switch_to: Passare a {{view_name}} vista
+          switch_to: Passare a %{view_name} vista
           list: lista
           grid: griglia
       grid_view:

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

@@ -3,13 +3,13 @@ nb:
     refinery_images:
       title: Bilder
   no_file_chosen: Du må velge en fil du ønsker å laste opp
-  file_should_be_smaller_than_max_image_size: "Filer må være mindre enn {{max_image_size}}"
+  file_should_be_smaller_than_max_image_size: "Filer må være mindre enn %{max_image_size}"
   file_must_be_these_formats: "Bildefilen må være enten en JPG, PNG eller GIF"
   admin:
     images:
       image:
         delete:
-          message: "Er du sikker på at du ønsker å slette '{{title}}'?"
+          message: "Er du sikker på at du ønsker å slette '%{title}'?"
           title: Slett dette bildet permanent
       form:
         image: Bilde
@@ -17,16 +17,16 @@ nb:
         or: eller
         replace_image: Erstatt det med dette ...
         current_image: Gjeldende bilde
-        maximum_image_size: "Den største tillatte størrelsen på et bilde er {{megabytes}} MB."
+        maximum_image_size: "Den største tillatte størrelsen på et bilde er %{megabytes} MB."
       index:
         create_new_image: Lag et nytt bilde
         no_images_yet: Det er ingen bilder her enda. Trykk på "Lag et nytt bilde" for å legge til ditt første bilde.
         view:
-          switch_to: "Endre til {{view_name}} visning"
+          switch_to: "Endre til %{view_name} visning"
           list: liste
           grid: rutenett
         search:
-          results_for: "Søkeresultater for {{query}}"
+          results_for: "Søkeresultater for %{query}"
       grid_view:
         edit: Rediger dette bildet
         view_live: Vis dette bildet <br/><em>Åpner i et nytt vindu</em>

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

@@ -3,13 +3,13 @@ nl:
     refinery_images:
       title: Afbeeldingen
   no_file_chosen: U moet een afbeelding kiezen om te uploaden.
-  file_should_be_smaller_than_max_image_size: Afbeeldingen mogen niet groter dan {{max_image_size}} zijn.
+  file_should_be_smaller_than_max_image_size: Afbeeldingen mogen niet groter dan %{max_image_size} zijn.
   file_must_be_these_formats: Uw afbeelding moet een JPG, PNG of GIF zijn.
   admin:
     images:
       image:
         delete:
-          message: Weet u zeker dat u '{{title}}' wilt verwijderen?
+          message: Weet u zeker dat u '%{title}' wilt verwijderen?
           title: Verwijder deze afbeelding permanent
       form:
         image: Afbeelding
@@ -17,16 +17,16 @@ nl:
         or: of
         replace_image: Vervang de afbeelding door deze
         current_image: Huidige afbeelding
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "The maximum image size is %{megabytes} megabytes."
       index:
         create_new_image: Upload een nieuwe afbeelding
         no_images_yet: Er zijn nog geen afbeeldingen. Klik op "Upload een nieuwe afbeelding" om uw eerste afbleelding toe te voegen.
         view:
-          switch_to: Bekijk de {{view_name}} versie
+          switch_to: Bekijk de %{view_name} versie
           list: lijst
           grid: tabel
         search:
-          results_for: "Bekijk de zoekresultaten voor: {{query}}"
+          results_for: "Bekijk de zoekresultaten voor: %{query}"
       grid_view:
         edit: Bewerk deze afbeelding
         view_live: Bekijk deze afbeelding <br/><em>(opent een nieuw venster)</em>

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

@@ -5,13 +5,13 @@ pt-BR:
     refinery_images:
       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_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:
       image:
         delete:
-          message: Você tem certeza que quer remover '{{title}}'?
+          message: Você tem certeza que quer remover '%{title}'?
           title: Remover esta imagem para sempre
       form:
         image: Imagem
@@ -19,16 +19,16 @@ pt-BR:
         or: ou
         replace_image: Substituir por esta...
         current_image: Imagem atual
-        maximum_image_size: "O tamanho máximo permitido é de {{megabytes}} megabytes."
+        maximum_image_size: "O tamanho máximo permitido é de %{megabytes} megabytes."
       index:
         create_new_image: Criar Nova Imagem
         no_images_yet: Ainda não existem imagens. Clique em "Criar Nova Imagem" para adicionar sua primeira imagem.
         view:
-          switch_to: Trocar para visão em {{view_name}}
+          switch_to: Trocar para visão em %{view_name}
           list: lista
           grid: grade
         search:
-          results_for: Resultados da busca por {{query}}
+          results_for: Resultados da busca por %{query}
       grid_view:
         edit: Editar esta imagem
         view_live: "Clique para ver a imagem<br/><em>Abre em uma nova janela</em>"

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

@@ -3,13 +3,13 @@ ru:
     refinery_images:
       title: Изображения
   no_file_chosen: Вы должны выбрать файл для загрузки
-  file_should_be_smaller_than_max_image_size: "Файлы должны быть меньше по размеру, чем {{max_image_size}}"
+  file_should_be_smaller_than_max_image_size: "Файлы должны быть меньше по размеру, чем %{max_image_size}"
   file_must_be_these_formats: "Ваше изображение может быть только в форматах JPG, PNG или GIF"
   admin:
     images:
       image:
         delete:
-          message: "Вы действительно хотите удалить «{{title}}»?"
+          message: "Вы действительно хотите удалить «%{title}»?"
           title: Удалить это изображение навсегда
       form:
         image: Изображение
@@ -17,16 +17,16 @@ ru:
         or: или
         replace_image: заменить его этим
         current_image: Текущее изображение
-        maximum_image_size: "Максимальный размер изображения — {{megabytes}} МБ."
+        maximum_image_size: "Максимальный размер изображения — %{megabytes} МБ."
       index:
         create_new_image: Создать новое изображение
         no_images_yet: "Изображений пока что нет. Нажмите «Создать новое изображение», чтобы добавить ваше первое изображение."
         view:
-          switch_to: Показать {{view_name}}
+          switch_to: Показать %{view_name}
           list: списком
           grid: сеткой
         search:
-          results_for: Search results for {{query}}
+          results_for: Search results for %{query}
       grid_view:
         edit: Редактировать это изображение
         view_live: Показать это изображение <br/><em>Откроется в новом окне</em>

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

@@ -3,13 +3,13 @@ sl:
     refinery_images:
       title: Slike
   no_file_chosen: Izbrati morate datoteko, ki jo želite prenesti
-  file_should_be_smaller_than_max_image_size: Velikost datoteka mora biti manjša od {{max_image_size}}
+  file_should_be_smaller_than_max_image_size: Velikost datoteka mora biti manjša od %{max_image_size}
   file_must_be_these_formats: Slika mora biti tipa JPG, PNG ali GIF
   admin:
     images:
       image:
         delete:
-          message: Ali ste prepričani da želite odstraniti '{{title}}'?
+          message: Ali ste prepričani da želite odstraniti '%{title}'?
           title: Odstrani sliko
       form:
         image: Slika
@@ -17,16 +17,16 @@ sl:
         or: ali
         replace_image: jo zamenjaj z ...
         current_image: Trenutna Slika
-        maximum_image_size: "Največja dovoljena velikost slike je lahko {{megabytes}} megabajtov."
+        maximum_image_size: "Največja dovoljena velikost slike je lahko %{megabytes} megabajtov."
       index:
         create_new_image: Ustvari Novo Sliko
         no_images_yet: Trenutno še ni nobene slike. Za prenos prve slike kliknite "Ustvari Novo Sliko".
         view:
-          switch_to: Preklopi pogled v {{view_name}}
+          switch_to: Preklopi pogled v %{view_name}
           list: seznam
           grid: mrežo
         search:
-          results_for: Iskalni rezultati za {{query}}
+          results_for: Iskalni rezultati za %{query}
       grid_view:
         edit: Uredi sliko
         view_live: Poglej sliko <br/><em>Odpre se v novem oknu</em>