kuhsaft 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5add28c1486e71fff32b2b883f3f3185a7d33042
-  data.tar.gz: 3ac2da2de1aeecc79499b47781c0056be3f20b52
+  metadata.gz: 816a54fafbdf7a0080bebfe502d28bc3766c53ae
+  data.tar.gz: 46ea21de733eabc2fe7286479edcfc611e107f15
 SHA512:
-  metadata.gz: a3a7994b1fcdeaa1749facc3ea026584e29f2db55bb2affd43968fe4ff8050ded804f2365dd8046fb5bc13ddf5670f7fc657ab1f6582e625ef319a3682247fe0
-  data.tar.gz: 5bd943bd95becf2d08536b855082cda2ae7114cb3be4ada3be61e5c8606d33f578a5536e5ec3d8ef8cf281e9c663c162f0c4b7d48e125973a0f7d19c4d3c3e80
+  metadata.gz: b2ad4266fcd26ee4a9ba650bdeb7697d50404dd582ae9745528d561590db7453473e4d993e8ebb9ae31d79cf4a7711bee239a6c0d5112593e3aedec10e89453d
+  data.tar.gz: 516cfdb3e8dcea474fb9d45ae44075ddfcf65b5d7e9becc002154cefe1d999ae4644ebac717d434f4294ce010323f7ddb00c96a0f337817e7134a6384b25f520

data/app/assets/javascripts/kuhsaft/cms/application.js.coffee.erb

@@ -3,7 +3,7 @@
 #= require jquery
 #= require jquery_ujs
 #= require jquery.remotipart
-#= require jquery.ui.all
+#= require jquery-ui
 #= require bootstrap
 #= require bootstrap-modal-v2
 #= require bootstrap-modalmanager

data/app/controllers/kuhsaft/cms/admin_controller.rb

@@ -6,9 +6,8 @@ module Kuhsaft
       before_action :set_content_locale
 
       def set_content_locale
-        if params[:content_locale].present?
-          I18n.locale = params[:content_locale]
-        end
+        return if params[:content_locale].blank?
+        I18n.locale = params[:content_locale]
       end
 
       def url_options

data/app/controllers/kuhsaft/cms/bricks_controller.rb

@@ -5,7 +5,7 @@ module Kuhsaft
 
       def create
         @brick = params[:brick][:type].constantize.create(brick_params)
-        @brick.image_size = ImageSize.all.first.name.to_s
+        @brick.image_size ||= ImageSize.all.first.name.to_s
 
         if @brick.valid?
           respond_with @brick do |format|

data/app/controllers/kuhsaft/pages_controller.rb

@@ -5,9 +5,8 @@ module Kuhsaft
 
     def index
       @search = params[:search]
-      if @search.present?
-        @pages = Kuhsaft::Page.unscoped.published.content_page.search(@search)
-      end
+      return if @search.blank?
+      @pages = Kuhsaft::Page.unscoped.published.content_page.search(@search)
     end
 
     def show

data/app/controllers/kuhsaft/sitemaps_controller.rb

@@ -2,11 +2,10 @@ module Kuhsaft
   class SitemapsController < ::ApplicationController
     def index
       last_page = Kuhsaft::Page.published.last
-      if stale?(etag: last_page, last_modified: last_page.updated_at.utc)
-        respond_to do |format|
-          format.html
-          format.xml { @pages = Kuhsaft::Page.published }
-        end
+      return unless stale?(etag: last_page, last_modified: last_page.updated_at.utc)
+      respond_to do |format|
+        format.html
+        format.xml { @pages = Kuhsaft::Page.published }
       end
     end
   end

data/app/helpers/cms_helper.rb

@@ -12,4 +12,16 @@ module CmsHelper
     end
     pages << { title: t('kuhsaft.cms.pages.new.new_page'), link: '#' }
   end
+
+  def cms_brick_item(brick_list, type)
+    type_name = type.class_name.constantize.model_name.human
+    link_to type_name, kuhsaft.new_cms_brick_path(
+      brick: {
+        type: type.class_name,
+        brick_list_id: brick_list.id,
+        brick_list_type: brick_list.brick_list_type
+      }), remote: true
+  rescue NameError
+    I18n.t type.class_name.underscore, scope: [:activerecord, :models]
+  end
 end

data/app/models/kuhsaft/page.rb

@@ -123,9 +123,8 @@ module Kuhsaft
     end
 
     def update_child_urls
-      if children.any?
-        children.each { |child| child.update_attributes(url: child.create_url) }
-      end
+      return unless children.any?
+      children.each { |child| child.update_attributes(url: child.create_url) }
     end
 
     def nesting_name

data/app/models/kuhsaft/publish_state.rb

@@ -18,7 +18,7 @@ module Kuhsaft
         PublishState.new(name: 'published', value: PUBLISHED),
         PublishState.new(name: 'unpublished', value: UNPUBLISHED),
         PublishState.new(name: 'published_at', value: PUBLISHED_AT)
-        ]
+      ]
     end
   end
 end

data/app/uploaders/kuhsaft/image_brick_image_uploader.rb

@@ -28,9 +28,8 @@ module Kuhsaft
 
     def process_brick_image_size
       image_size = Kuhsaft::ImageSize.find_by_name(model.image_size)
-      if image_size.present?
-        resize_to_fill(image_size.width, image_size.height)
-      end
+      return unless image_size.present?
+      resize_to_fill(image_size.width, image_size.height)
     end
   end
 end

data/app/views/kuhsaft/cms/admin/_brick_type_dropdown.html.haml

@@ -5,9 +5,9 @@
       %span.caret
     %ul.dropdown-menu.pull-right
       - brick_list.brick_types.allowed.group_by(&:group).each do |group, types|
-        - types.each do |type|
+        - types.map { |type| cms_brick_item brick_list, type }.compact.each do |brick_type_item|
           %li
-            = link_to type.class_name.constantize.model_name.human, kuhsaft.new_cms_brick_path(:brick => {:type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type}), :remote => true
+            = brick_type_item
         .divider
   - else
     - brick_list.brick_types.allowed.each do |type|

data/config/locales/de.yml

@@ -100,6 +100,7 @@ de:
     messages:
       accepted: muss akzeptiert werden
       blank: muss ausgefüllt werden
+      present: muss leer sein
       confirmation: stimmt nicht mit der Bestätigung überein
       empty: muss ausgefüllt werden
       equal_to: muss genau %{count} sein
@@ -115,6 +116,9 @@ de:
       not_an_integer: muss ganzzahlig sein
       odd: muss ungerade sein
       record_invalid: 'Gültigkeitsprüfung ist fehlgeschlagen: %{errors}'
+      restrict_dependent_destroy:
+        one: "Datensatz kann nicht gelöscht werden, da eine Abhängikeit besteht."
+        many: "Datensatz kann nicht gelöscht werden, da Abhängikeiten bestehen."
       taken: ist bereits vergeben
       too_long: ist zu lang (mehr als %{count} Zeichen)
       too_short: ist zu kurz (weniger als %{count} Zeichen)

data/config/locales/en.yml

@@ -209,74 +209,3 @@ en:
   activerecord:
     errors:
       <<: *errors
-  kuhsaft:
-    cms:
-      admin:
-        brick_type_dropdown:
-          add_element: Add element
-          add_specific_element: Add specific element
-        confirm_delete: Confirm delete
-        empty_state:
-          empty: Empty
-        main_navigation:
-          logout: Logout
-      assets:
-        edit:
-          edit: Edit
-        index:
-          create: Create
-        list:
-          confirm: Confirm
-          delete: Delete
-        new:
-          new: New
-      bricks:
-        brick_item:
-          confirm: Confirm
-          save: Save
-          saved: Saved
-        new:
-          create_new: Create new
-          no_content: No content
-          save: Save
-      pages:
-        edit:
-          edit_html: Edit html
-        form:
-          collapse_all: Collapse all
-          expand_all: Expand all
-          hint_description: Hint description
-          hint_keywords: Hint keywords
-          tab_content: Tab content
-          tab_metadata: Tab metadata
-        index:
-          add_page: Add page
-        new:
-          new: New
-          new_page: New page
-          pages: Pages
-    image_bricks:
-      image_brick:
-        edit:
-          image_preview: Image preview
-    search:
-      form:
-        placeholder: Placeholder
-        search: Search
-      results:
-        title: Title
-    text_bricks:
-      text_brick:
-        read_less: Read less
-        read_more: Read more
-    video_bricks:
-      video_brick:
-        edit:
-          any_source_error: Any source error
-          embed_src_optional: Embed src optional
-  layouts:
-    kuhsaft:
-      cms:
-        flash:
-          success: Success
-  title: Title

data/config/locales/models/kuhsaft/accordion_brick/en.yml

@@ -0,0 +1,4 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/accordion_brick: 'Accordion'

data/config/locales/models/kuhsaft/accordion_item_brick/en.yml

@@ -0,0 +1,7 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/accordion_item_brick: 'Accorion section'
+    attributes:
+      kuhsaft/accordion_item_brick:
+        caption: 'Title'

data/config/locales/models/kuhsaft/anchor_brick/en.yml

@@ -0,0 +1,7 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/anchor_brick: 'Anchor'
+    attributes:
+      kuhsaft/anchor_brick:
+        caption: 'Name'

data/config/locales/models/kuhsaft/asset_brick/en.yml

@@ -0,0 +1,9 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/asset_brick: 'Asset'
+    attributes:
+      kuhsaft/asset_brick:
+        caption: 'Display text'
+        link_style: 'Style'
+        asset: 'Asset'

data/config/locales/models/kuhsaft/brick/de.yml

@@ -0,0 +1,5 @@
+de:
+  activerecord:
+    attributes:
+      kuhsaft/brick:
+        col_count: 'Breite im Grid'

data/config/locales/models/kuhsaft/brick/en.yml

@@ -0,0 +1,5 @@
+en:
+  activerecord:
+    attributes:
+      kuhsaft/brick:
+        col_count: 'Grid width'

data/config/locales/models/kuhsaft/column_brick/de.yml

@@ -2,5 +2,3 @@ de:
   activerecord:
     models:
       kuhsaft/column_brick: 'Spalte'
-    attributes:
-      kuhsaft/column_brick:

data/config/locales/models/kuhsaft/column_brick/en.yml

@@ -0,0 +1,4 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/column_brick: 'Column'

data/config/locales/models/kuhsaft/image_brick/en.yml

@@ -9,8 +9,3 @@ en:
         alt_text: 'Alt text'
         href: 'Link'
         image_size: 'Filesize'
-  kuhsaft:
-    image_bricks:
-      image_brick:
-        edit:
-          image_preview: 'Image preview'

data/config/locales/models/kuhsaft/image_size/en.yml

@@ -0,0 +1,13 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/image_size: 'Image size'
+    attributes:
+      kuhsaft/image_size:
+        name: 'Name'
+        label: 'Label'
+        width: 'Width'
+        height: 'Height'
+        sizes:
+          gallery: 'Gallery, 960x540'
+          teaser: 'Teaser, 320x180'

data/config/locales/models/kuhsaft/link_brick/en.yml

@@ -0,0 +1,10 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/link_brick: 'Link'
+    attributes:
+      kuhsaft/link_brick:
+        caption: 'Linktext'
+        href: 'Link'
+        link_style: 'Style'
+        open_in_new_window: 'Open in a new window?'

data/config/locales/models/kuhsaft/page/en.yml

@@ -0,0 +1,19 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/page:
+        one: 'Page'
+        other: 'Pages'
+    attributes:
+      kuhsaft/page:
+        title: 'Title'
+        slug: 'URL Name'
+        page_title: 'Page title (in browser)'
+        keywords: 'Keywords'
+        description: 'Description'
+        redirect_url: 'Redirect URL'
+        url: 'URL'
+        published: 'Published'
+        page_type: 'Pagetype'
+        parent_id: 'Parent page'
+        parent: 'Parent page'

data/config/locales/models/kuhsaft/placeholder_brick/en.yml

@@ -0,0 +1,8 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/placeholder_brick: 'Placeholder'
+    attributes:
+      kuhsaft/placeholder_brick:
+        template_name: 'Template'
+        contact_form: 'Contact form'

data/config/locales/models/kuhsaft/slider_brick/en.yml

@@ -0,0 +1,4 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/slider_brick: 'Slider / Carousel'

data/config/locales/models/kuhsaft/text_brick/en.yml

@@ -9,8 +9,3 @@ en:
   errors:
     messages:
       blank: "%{attribute} can't be blank"
-  kuhsaft:
-    text_bricks:
-      text_brick:
-        read_less: 'Read less'
-        read_more: 'Read more'

data/config/locales/models/kuhsaft/two_column_brick/en.yml

@@ -0,0 +1,7 @@
+en:
+  activerecord:
+    models:
+      kuhsaft/two_column_brick: 'Two column element'
+    attributes:
+      kuhsaft/two_column_brick:
+        partitioning: 'Partition'

data/config/locales/models/kuhsaft/video_brick/en.yml

@@ -7,9 +7,3 @@ en:
         video: 'Source'
         embed_src: 'Embed Code'
         href: 'Video'
-  kuhsaft:
-    video_bricks:
-      video_brick:
-        edit:
-          any_source_error: 'Any source error'
-          embed_src_optional: 'Embed src optional'

data/config/locales/views/kuhsaft/cms/admin/en.yml

@@ -0,0 +1,12 @@
+en:
+  kuhsaft:
+    cms:
+      admin:
+        confirm_delete: 'Are you sure you want to delete %{name}?'
+        brick_type_dropdown:
+          add_element: 'Add element'
+          add_specific_element: 'Add %{name}'
+        empty_state:
+          empty: 'This element is empty yet...'
+        main_navigation:
+          logout: 'Log out'

data/config/locales/views/kuhsaft/cms/bricks/de.yml

@@ -7,18 +7,12 @@ de:
           saved: 'Gespeichert! ✔'
           confirm: 'Wirklich löschen?'
           empty: 'Hier ist noch nichts.'
+        new:
+          create_new: '%{brick} erstellen'
+          save: Speichern
+          no_content: 'Dieser Brick hat keinen eigenen Inhalt. Nach dem Speichern können darin weitere Bricks erstellt werden.'
 
         columns:
           zero: Nicht ins Grid integrieren
           one: "%{count} Spalte"
           other: "%{count} Spalten"
-
-    image_bricks:
-      image_brick:
-        edit:
-          image_preview: 'Vorschau'
-
-  activerecord:
-    attributes:
-      kuhsaft/brick:
-        col_count: 'Breite im Grid'

data/config/locales/views/kuhsaft/cms/bricks/en.yml

@@ -0,0 +1,18 @@
+en:
+  kuhsaft:
+    cms:
+      bricks:
+        brick_item:
+          save: 'Save ...'
+          saved: 'Saved! ✔'
+          confirm: 'Are you sure?'
+          empty: 'This element is empty...'
+        new:
+          create_new: 'Create %{brick}'
+          save: Save
+          no_content: 'This Brick has no own content. You can create more bricks within after saving.'
+
+        columns:
+          zero: Do not add to grid
+          one: "%{count} column"
+          other: "%{count} columns"

data/config/locales/views/kuhsaft/cms/pages/en.yml

@@ -0,0 +1,31 @@
+en:
+  kuhsaft:
+    cms:
+      pages:
+        index:
+          add_page: 'Add page'
+        form:
+          tab_metadata: 'Settings'
+          tab_content: 'Content'
+          hint_keywords: |
+            Please enter 2-6 key terms that apply to this page, as search keywords.
+            </br>
+            <strong>For example:</strong>
+            </br>
+            <em>
+            Keyword1, Keyword2, Keyword3
+            </em>
+          hint_description: |
+            Enter a page description about 140 characters.
+            </br>
+             The description is often displayed in the search results of search engines.
+            </br>
+            <strong>For example:</strong>
+            </br>
+            <em>
+             Description of the page content.
+             This description is unique and only available on this page. Other pages have their own descriptions.
+            </em>
+          expand_all: Expand all
+          collapse_all: Collapse all
+          none: none

data/config/locales/views/kuhsaft/image_brick/de.yml

@@ -0,0 +1,6 @@
+de:
+  kuhsaft:
+    image_bricks:
+      image_brick:
+        edit:
+          image_preview: 'Vorschau'

data/config/locales/views/kuhsaft/image_brick/en.yml

@@ -0,0 +1,6 @@
+en:
+  kuhsaft:
+    image_bricks:
+      image_brick:
+        edit:
+          image_preview: 'Preview'

data/config/locales/views/kuhsaft/text_brick/en.yml

@@ -0,0 +1,6 @@
+en:
+  kuhsaft:
+    text_bricks:
+      text_brick:
+        read_more: 'Read more'
+        read_less: 'Read less'

data/config/locales/views/kuhsaft/video_brick/en.yml

@@ -0,0 +1,7 @@
+en:
+  kuhsaft:
+    video_bricks:
+      video_brick:
+        edit:
+          any_source_error: 'Please enter at least one video source.'
+          embed_src_optional: 'Alternatively an HTML code can be entered to embed a video.'

data/lib/kuhsaft/brick_list.rb

@@ -59,13 +59,9 @@ module Kuhsaft
     # Implement how you see fit.
     #
     def collect_fulltext
-      if respond_to?(:bricks)
-        bricks.localized.reduce('') do |text, brick|
-          text << brick.collect_fulltext
-          text
-        end
-      else
-        ''
+      return '' unless respond_to?(:bricks)
+      bricks.localized.reduce('') do |text, brick|
+        text << brick.collect_fulltext
       end
     end
 

data/lib/kuhsaft/page_tree.rb

@@ -6,9 +6,8 @@ module Kuhsaft
       params.each do |page_position, page_content|
         page = Page.find(page_content['id'])
         page.update_attributes(parent_id: parent_id, position: page_position)
-        unless page_content['children'].nil?
-          update(page_content['children'], page.id)
-        end
+        next if page_content['children'].nil?
+        update(page_content['children'], page.id)
       end
     end
   end

data/lib/kuhsaft/touch_placeholders.rb

@@ -11,11 +11,10 @@ module Kuhsaft
     end
 
     def touch_placeholders
-      if self.class.placeholder_templates.present?
-        self.class.placeholder_templates.each do |template_name|
-          related_templates = Kuhsaft::PlaceholderBrick.where(template_name: template_name)
-          related_templates.each { |p| p.touch } if related_templates
-        end
+      return unless self.class.placeholder_templates.present?
+      self.class.placeholder_templates.each do |template_name|
+        related_templates = Kuhsaft::PlaceholderBrick.where(template_name: template_name)
+        related_templates.each { |p| p.touch } if related_templates
       end
     end
 

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = '2.4.2'
+  VERSION = '2.4.3'
 end

data/spec/features/cms_pages_spec.rb

@@ -7,15 +7,15 @@ describe 'Cms/Pages' do
   context '#new' do
     before do
       visit kuhsaft.new_cms_page_path
-      fill_in 'Titel', with: 'The Title of the page'
-      fill_in 'Stichwörter', with: 'My keywords'
-      fill_in 'Beschreibung', with: 'My Description'
+      fill_in 'Title', with: 'The Title of the page'
+      fill_in 'Keywords', with: 'My keywords'
+      fill_in 'Description', with: 'My Description'
     end
 
     describe '#create' do
       context 'when page is valid' do
         it 'creates a new page' do
-          expect { click_on 'Create Seite' }.to change(Kuhsaft::Page, :count).by(1)
+          expect { click_on 'Create Page' }.to change(Kuhsaft::Page, :count).by(1)
         end
 
         it 'is not possible to change the value in url' do
@@ -28,7 +28,7 @@ describe 'Cms/Pages' do
           @page = FactoryGirl.create(:page, title: 'DummyPage', title_en: 'DummyEN', slug: 'dummy_page')
           visit kuhsaft.edit_cms_page_path(@page)
           fill_in 'page_title', with: ''
-          click_on 'Update Seite'
+          click_on 'Update Page'
           within '.nav-pills' do
             click_on 'EN'
           end
@@ -42,22 +42,22 @@ describe 'Cms/Pages' do
         before do
           @page = FactoryGirl.create(:page, url: 'de/dumdidum')
           visit kuhsaft.edit_cms_page_path(@page)
-          select 'redirect', from: 'Seitentyp'
+          select 'redirect', from: 'Pagetyp'
         end
 
         it 'has a value in redirect_page' do
           fill_in 'Redirect URL', with: 'target_page'
-          expect { click_on 'Update Seite' }.to change { @page.reload.redirect_url }.to('target_page')
+          expect { click_on 'Update Page' }.to change { @page.reload.redirect_url }.to('target_page')
         end
 
         it 'is invalid when no value is in redirect_page' do
-          click_on 'Update Seite'
+          click_on 'Update Page'
           page.should have_css('.error', count: 1)
         end
 
         it 'does not change the value in url' do
           fill_in 'Redirect URL', with: 'target_page'
-          expect { click_on 'Update Seite' }.to_not change { @page.reload.url }
+          expect { click_on 'Update Page' }.to_not change { @page.reload.url }
         end
       end
     end

data/spec/lib/page_tree_spec.rb

@@ -10,7 +10,7 @@ module Kuhsaft
       {
         '0' => { 'id' => '1', 'children' => { '0' => { 'id' => '2' } } },
         '1' => { 'id' => '3' }
-       }
+      }
     end
 
     before :each do

data/spec/spec_helper.rb

@@ -4,8 +4,12 @@ require_relative File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 
-['factory_girl', 'capybara/rails', 'pry-debugger', 'database_cleaner'
-  ].each { |lib| require lib }
+[
+  'factory_girl',
+  'capybara/rails',
+  'pry-debugger',
+  'database_cleaner'
+].each { |lib| require lib }
 
 FactoryGirl.find_definitions
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -590,33 +590,51 @@ files:
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/de.yml
 - config/locales/en.yml
-- config/locales/kuhsaft.de.yml
-- config/locales/kuhsaft.en.yml
 - config/locales/models/kuhsaft/accordion_brick/de.yml
+- config/locales/models/kuhsaft/accordion_brick/en.yml
 - config/locales/models/kuhsaft/accordion_item_brick/de.yml
+- config/locales/models/kuhsaft/accordion_item_brick/en.yml
 - config/locales/models/kuhsaft/anchor_brick/de.yml
+- config/locales/models/kuhsaft/anchor_brick/en.yml
 - config/locales/models/kuhsaft/asset_brick/de.yml
+- config/locales/models/kuhsaft/asset_brick/en.yml
+- config/locales/models/kuhsaft/brick/de.yml
+- config/locales/models/kuhsaft/brick/en.yml
 - config/locales/models/kuhsaft/column_brick/de.yml
+- config/locales/models/kuhsaft/column_brick/en.yml
 - config/locales/models/kuhsaft/image_brick/de.yml
 - config/locales/models/kuhsaft/image_brick/en.yml
 - config/locales/models/kuhsaft/image_size/de.yml
+- config/locales/models/kuhsaft/image_size/en.yml
 - config/locales/models/kuhsaft/link_brick/de.yml
+- config/locales/models/kuhsaft/link_brick/en.yml
 - config/locales/models/kuhsaft/page/de.yml
+- config/locales/models/kuhsaft/page/en.yml
 - config/locales/models/kuhsaft/placeholder_brick/de.yml
+- config/locales/models/kuhsaft/placeholder_brick/en.yml
 - config/locales/models/kuhsaft/slider_brick/de.yml
+- config/locales/models/kuhsaft/slider_brick/en.yml
 - config/locales/models/kuhsaft/text_brick/de.yml
 - config/locales/models/kuhsaft/text_brick/en.yml
 - config/locales/models/kuhsaft/two_column_brick/de.yml
+- config/locales/models/kuhsaft/two_column_brick/en.yml
 - config/locales/models/kuhsaft/video_brick/de.yml
 - config/locales/models/kuhsaft/video_brick/en.yml
 - config/locales/simple_form.en.yml
 - config/locales/views/kuhsaft/cms/admin/de.yml
+- config/locales/views/kuhsaft/cms/admin/en.yml
 - config/locales/views/kuhsaft/cms/bricks/de.yml
+- config/locales/views/kuhsaft/cms/bricks/en.yml
 - config/locales/views/kuhsaft/cms/pages/de.yml
-- config/locales/views/kuhsaft/cms/video_bricks/de.yml
+- config/locales/views/kuhsaft/cms/pages/en.yml
+- config/locales/views/kuhsaft/image_brick/de.yml
+- config/locales/views/kuhsaft/image_brick/en.yml
 - config/locales/views/kuhsaft/search/de.yml
 - config/locales/views/kuhsaft/search/en.yml
 - config/locales/views/kuhsaft/text_brick/de.yml
+- config/locales/views/kuhsaft/text_brick/en.yml
+- config/locales/views/kuhsaft/video_brick/de.yml
+- config/locales/views/kuhsaft/video_brick/en.yml
 - config/routes.rb
 - db/migrate/01_create_kuhsaft_pages.rb
 - db/migrate/02_create_kuhsaft_bricks.rb

data/config/locales/kuhsaft.de.yml

@@ -1,66 +0,0 @@
-de:
-  404: '404, Seite nicht gefunden'
-  layouts:
-    kuhsaft:
-      admin:
-        pages_nav: 'Seiten'
-        assets_nav: 'Assets'
-      cms:
-        flash:
-          success: 'Seite wurde erfolgreich aktualisiert'
-  kuhsaft:
-    page_part:
-      markdown: 'Formatierter Text'
-    cms:
-      bricks:
-        brick_item:
-          confirm: 'Sind Sie sicher?'
-        new:
-          create_new: '%{brick} erstellen'
-          save: Speichern
-          no_content: 'Dieser Brick hat keinen eigenen Inhalt. Nach dem Speichern können darin weitere Bricks erstellt werden.'
-      ckimages:
-        confirm: 'Sind Sie sicher?'
-      pages:
-        index:
-          create: 'Neue Seite erstellen'
-        new:
-          new: 'Neue Seite erstellen'
-          pages: 'Seiten'
-        edit:
-          edit_html: 'Seite editieren: <span>%{title}</span>'
-          pages: 'Seiten'
-        branch:
-          add: 'Seite hinzufügen'
-          create: 'Neue Seite erstellen'
-          delete: 'Seite entfernen'
-          confirm: 'Soll die Seite "%{page_title}" endgültig entfernt werden?'
-          not_translated: 'Noch nicht übersetzt'
-        form:
-          add_page_part: 'Element hinzufügen'
-          unpublished: 'Seite offline sichern'
-          published: 'Seite publizieren'
-          published_at: 'Publizieren am'
-          confirm: 'Soll dieser Teil der Seite entgültig entfernt werden?'
-          destroy_page_part: 'Löschen'
-          separate_by_comma: 'Tags durch Komma trennen'
-        current_translation_locale: 'Aktuelle Übersetzung: %{translation_locale}'
-      assets:
-        index:
-          create: 'Neues Asset hinzufügen'
-        list:
-          confirm: 'Soll das Asset "%{filename}" entgültig entfernt werden?'
-          delete: 'Asset löschen'
-  helpers:
-    select:
-      prompt: Bitte wählen
-    submit:
-      create: '%{model} erstellen'
-      submit: '%{model} speichern'
-      update: '%{model} aktualisieren'
-  simple_form:
-    labels:
-      title: 'Seiten Titel'
-      slug: 'URL Segment'
-      page_part_type: 'Element hinzufügen'
-      _destroy: 'Diese Element löschen'

data/config/locales/kuhsaft.en.yml

@@ -1,113 +0,0 @@
-en:
-  404: '404, Page not found'
-  layouts:
-    kuhsaft:
-      admin:
-        pages_nav: 'Pages'
-        assets_nav: 'Assets'
-      cms:
-        flash:
-          success: 'Page was updated successfully'
-  kuhsaft:
-    page_part:
-      markdown: 'Formatted Text'
-    cms:
-      bricks:
-        brick_item:
-          confirm: 'Are you sure?'
-        new:
-          create_new: 'Create %{brick}'
-          save: Save
-          no_content: 'This Brick has no own content. You can create more bricks within after saving.'
-      pages:
-        index:
-          create: 'Create new page'
-        new:
-          new: 'Creating new page'
-          pages: 'Pages'
-        edit:
-          edit_html: 'Editing page: <span>%{title}</span>'
-          pages: 'Pages'
-        branch:
-          add: 'Add page'
-          create: 'Create new page'
-          delete: 'Remove page'
-          confirm: 'Are you sure you want to delete the page "%{page_title}"?'
-          not_translated: 'Not yet translated'
-        form:
-          add_page_part: 'Add element'
-          unpublished: "Save page offline"
-          published: "Publish page"
-          published_at: "Go online on"
-          confirm: 'Are you sure you want to delete this page part?'
-          destroy_page_part: 'Delete'
-          separate_by_comma: 'Separate tags by comma'
-        current_translation_locale: 'Current translation: %{translation_locale}'
-      assets:
-        index:
-          create: 'Create new asset'
-        list:
-          confirm: 'Are you sure you want to delete the asset "%{filename}"?'
-          delete: 'Delete asset'
-      admin:
-        brick_type_dropdown:
-          add_element: Add element
-          add_specific_element: Add specific element
-        confirm_delete: Confirm delete
-        empty_state:
-          empty: Empty
-        main_navigation:
-          logout: Logout
-      assets:
-        edit:
-          edit: Edit
-        index:
-          create: Create
-        list:
-          confirm: Confirm
-          delete: Delete
-        new:
-          new: New
-      bricks:
-        brick_item:
-          confirm: Confirm
-          save: Save
-          saved: Saved
-        new:
-          create_new: Create new
-          no_content: No content
-          save: Save
-      pages:
-        edit:
-          edit_html: Edit html
-        form:
-          collapse_all: Collapse all
-          expand_all: Expand all
-          hint_description: Hint description
-          hint_keywords: Hint keywords
-          tab_content: Tab content
-          tab_metadata: Tab metadata
-        index:
-          add_page: Add page
-        new:
-          new: New
-          new_page: New page
-          pages: Pages
-    search:
-      form:
-        placeholder: Placeholder
-        search: Search
-      results:
-        title: Title
-  layouts:
-    kuhsaft:
-      cms:
-        flash:
-          success: Success
-  title: Title
-  simple_form:
-    labels:
-      title: 'Page title'
-      slug: 'URL segment'
-      page_part_type: 'Add element'
-      _destroy: 'Delete this element'