Merge branch 'master' of git@github.com:PeterBerkenbosch/spree-static…

…-content

README.rdoc

@@ -25,15 +25,19 @@ extension to change the layout of the static pages.
     <% end %>
   </ul>
 
-== INSTALLATION:
-Suggest you load this extension before all other extensions as it 
-specifies a filter in Spree::BaseController that may not get inherited by its
-controller subclasses if other extensions modify these controller subclasses
-first.  
+== Installation and filter chain workaround:
+Suggest you load this extension after the localization extension (you get the localization extension for free in spree core)
+and before your remaining extensions as the static content extension specifies a filter in Spree::BaseController that may not get inherited by its
+controller subclasses if other extensions modify these controller subclasses first.
 
-To load this extension first, add this to your environment.rb inside the
+We load the localization extension first to prevent its filter from being omitted from the filter chain.
+
+Hope to resolve this workaround in the near future, see bug here for more info: 
+http://railsdog.lighthouseapp.com/projects/31096-spree/tickets/653-specifying-filters-in-extensions-can-create-filter-chains-missing-filters
+
+Add this to your environment.rb inside the
 
 "Spree::Initializer.run do |config|" block:
 
 ===
-  config.extensions = [:static_content, :all]
+  config.extensions = [:localization, :static_content, :all]

config/locales/pl.yml

@@ -6,4 +6,5 @@ pl:
     ext_static_content_slug: Skrót
     ext_static_content_body: Zawartość
     ext_static_content_new_page: Nowa strona
-    ext_static_content_editing_page: Edycja strony
+    ext_static_content_editing_page: Edycja strony
+    ext_static_content_visible: Widoczna na stronie głównej

config/locales/pt-BR.yml

@@ -0,0 +1,13 @@
+---
+pt-BR:
+    ext_static_content_static_pages: Páginas estáticas
+    ext_static_content_static_pages_desc: Administrar página estática com editor visual (WYSIWYG).
+    ext_static_content_title: Título
+    ext_static_content_slug: Slug
+    ext_static_content_body: Corpo
+    ext_static_content_new_page: Nova página
+    ext_static_content_editing_page: Editando página
+    ext_static_content_foreign_link: Link externo (URL)
+    ext_static_content_show_in_header: Mostrar no cabeçalho
+    ext_static_content_show_in_footer: Mostrar no rodapé
+    ext_static_content_position: Posição