spina 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518d03186a99205d0184d237021a2b45ecb48129
-  data.tar.gz: ffaf0d527463191382eed520a0774358da919c07
+  metadata.gz: 09fedb5b12f1905604e9f97fab0054fd709ea5f8
+  data.tar.gz: 1a370c95dcaa5e420bc782b67b4bd624afb1205d
 SHA512:
-  metadata.gz: 5eba9c17c588cf3c1fcc612d0942ade9313638c9e1f007d240c8616554a7b1d6c6bbda7aa49b4518932c62437b7df909442c2d20be1dd262cc73692d6cf09260
-  data.tar.gz: 058a17fda706bb9af6cc97f23f712edfe443ffe48a42aa474c6ea29e7a9867e379eb94134cc776dca1a43d5de3a87e65466cbbde12db0c2a04e7f893ce9d8d60
+  metadata.gz: 436b5f3ffb9b1d51c1aec59ba3bec22517be2f09e6a49a0ec06fdd9d62e27a8839bb4ebe1923dd754157fcc9338f7d0a29b7a59c56c6a1ec7d9beebb8fea10ed
+  data.tar.gz: 3ee6db760b6aa74fd68d42d8c42905b2db6b02ad41ce5b2097c2b78c23d8e84b7b7629a4c22eeeb43f4e78abfc29160747cd56f917a1c6aea90e6b042d06b863

data/app/assets/javascripts/spina/admin/pages.js.coffee

@@ -39,11 +39,9 @@ $(document).on 'click', '.sort-switch', (event) ->
   if $(this).attr('data-icon') == 'j'
     $(this).attr('data-icon', '8')
     $(this).removeClass('button-success')
-    $(this).addClass('button-link')
-    $(this).text('Volgorde wijzigen')
+    $(this).text($(this).data('change-order'))
   else
     $(this).attr('data-icon', 'j')
     $(this).addClass('button-success')
-    $(this).removeClass('button-link')
-    $(this).text('Klaar met slepen')
+    $(this).text($(this).data('done-changing-order'))
   return false

data/app/controllers/spina/admin/accounts_controller.rb

@@ -7,27 +7,27 @@ module Spina
       layout "spina/admin/settings"
 
       def edit
-        add_breadcrumb "Algemene gegevens", spina.edit_admin_account_path
+        add_breadcrumb I18n.t('spina.preferences.account'), spina.edit_admin_account_path
       end
 
       def update
         if current_account.update_attributes(account_params)
-          redirect_to :back, notice: "Voorkeuren zijn bijgewerkt"
+          redirect_to :back
         else
-          redirect_to :back, alert: "Voorkeuren zijn niet bijgewerkt"
+          redirect_to :back
         end
       end
 
       def analytics
-        add_breadcrumb "Statistieken en zoekmachines", spina.analytics_admin_account_path
+        add_breadcrumb I18n.t('spina.preferences.analytics'), spina.analytics_admin_account_path
       end
 
       def social
-        add_breadcrumb "Social media", spina.social_admin_account_path
+        add_breadcrumb I18n.t('spina.preferences.social_media'), spina.social_admin_account_path
       end
 
       def style
-        add_breadcrumb "Vormgeving", spina.style_admin_account_path
+        add_breadcrumb I18n.t('spina.preferences.style'), spina.style_admin_account_path
         @themes = ::Spina.themes
         @layout_parts = current_theme.config.layout_parts.map { |layout_part| current_account.layout_part(layout_part) }
       end

data/app/controllers/spina/admin/admin_controller.rb

@@ -10,7 +10,7 @@ module Spina
       private
 
       def authorize_user
-        redirect_to spina.admin_login_url, flash: {information: "Je zult eerst moeten inloggen."} unless current_user
+        redirect_to spina.admin_login_url, flash: {information: I18n.t('spina.notifications.login')} unless current_user
       end
 
       def new_messages

data/app/controllers/spina/admin/attachments_controller.rb

@@ -8,7 +8,7 @@ module Spina
       layout "spina/admin/media_library"
 
       def index
-        add_breadcrumb "Documenten", spina.admin_attachments_path
+        add_breadcrumb I18n.t('spina.website.documents'), spina.admin_attachments_path
         @attachments = Attachment.file_attached.sorted
         @attachment = Attachment.new
       end
@@ -44,7 +44,7 @@ module Spina
       private
 
       def set_breadcrumbs
-        add_breadcrumb "Mediabibliotheek", spina.admin_media_library_path
+        add_breadcrumb I18n.t('spina.website.media_library'), spina.admin_media_library_path
       end
 
       def attachment_params

data/app/controllers/spina/admin/inquiries_controller.rb

@@ -8,30 +8,30 @@ module Spina
 
       def show
         @inquiry = Inquiry.find(params[:id])
-        add_breadcrumb "Alle berichten", spina.admin_inquiries_path
+        add_breadcrumb I18n.t('spina.inquiries.all'), spina.admin_inquiries_path
         add_breadcrumb @inquiry.name
       end
 
       def inbox_show
         @inquiry = Inquiry.find(params[:id])
-        add_breadcrumb "Inbox", spina.inbox_admin_inquiries_path
+        add_breadcrumb I18n.t('spina.inquiries.inbox'), spina.inbox_admin_inquiries_path
         add_breadcrumb @inquiry.name
         render :show
       end
 
       def index
-        add_breadcrumb "Alle berichten", spina.admin_inquiries_path
+        add_breadcrumb I18n.t('spina.inquiries.all'), spina.admin_inquiries_path
         @inquiries = Inquiry.sorted
       end
 
       def inbox
-        add_breadcrumb "Inbox", spina.inbox_admin_inquiries_path
+        add_breadcrumb I18n.t('spina.inquiries.inbox'), spina.inbox_admin_inquiries_path
         @inquiries = Inquiry.new_messages.sorted
       end
 
       def spam
-        add_breadcrumb "Alle berichten", spina.admin_inquiries_path
-        add_breadcrumb "Spam", spina.spam_admin_inquiries_path
+        add_breadcrumb I18n.t('spina.inquiries.all'), spina.admin_inquiries_path
+        add_breadcrumb I18n.t('spina.inquiries.spam'), spina.spam_admin_inquiries_path
         @inquiries = Inquiry.spam.order('created_at DESC')
       end
 
@@ -50,7 +50,7 @@ module Spina
       def destroy
         @inquiry = Inquiry.find(params[:id])
         @inquiry.destroy
-        redirect_to spina.admin_inquiries_path, notice: "Het bericht is verwijderd."
+        redirect_to spina.admin_inquiries_path
       end
 
       private

data/app/controllers/spina/admin/pages_controller.rb

@@ -17,15 +17,15 @@ module Spina
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
           @page.view_template = params[:view_template] 
         end
-        add_breadcrumb "Nieuwe pagina"
+        add_breadcrumb I18n.t('spina.pages.new')
         @page_parts = current_theme.config.page_parts.map { |page_part| @page.page_part(page_part) }
       end
 
       def create
         @page = Page.new(page_params)
-        add_breadcrumb "Nieuwe pagina"
+        add_breadcrumb I18n.t('spina.pages.new')
         if @page.save
-          redirect_to spina.admin_pages_url, notice: "#{@page.title} is aangemaakt."
+          redirect_to spina.admin_pages_url
         else
           @page_parts = @page.page_parts
           render :new
@@ -43,7 +43,7 @@ module Spina
         add_breadcrumb @page.title
         respond_to do |format|
           if @page.update_attributes(page_params)
-            format.html { redirect_to spina.admin_pages_url, notice: "#{@page.title} opgeslagen" }
+            format.html { redirect_to spina.admin_pages_url }
             format.js
           else
             format.html do
@@ -70,13 +70,13 @@ module Spina
       def destroy
         @page = Page.find(params[:id])
         @page.destroy
-        redirect_to spina.admin_pages_url, notice: "De pagina is verwijderd."
+        redirect_to spina.admin_pages_url
       end
 
       private
 
       def set_breadcrumb
-        add_breadcrumb "Pagina's", spina.admin_pages_path
+        add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
       end
 
       def update_page_position(page, parent_id = nil)

data/app/controllers/spina/admin/photos_controller.rb

@@ -8,7 +8,7 @@ module Spina
       layout "spina/admin/media_library"
 
       def index
-        add_breadcrumb "Afbeeldingen", spina.admin_photos_path
+        add_breadcrumb I18n.t('spina.website.photos'), spina.admin_photos_path
         @photos = Photo.sorted
         @photo = Photo.new
       end
@@ -65,7 +65,7 @@ module Spina
       private
 
       def set_breadcrumbs
-        add_breadcrumb "Mediabibliotheek", spina.admin_media_library_path
+        add_breadcrumb I18n.t('spina.website.media_library'), spina.admin_media_library_path
       end
 
       def photo_params

data/app/controllers/spina/admin/sessions_controller.rb

@@ -16,7 +16,7 @@ module Spina
           user.update_last_logged_in!
           redirect_to spina.admin_root_url
         else
-          flash.now[:alert] = "Email of wachtwoord is onjuist"
+          flash.now[:alert] = I18n.t('spina.notifications.wrong_username_or_password')
           render "new"
         end
       end

data/app/controllers/spina/admin/users_controller.rb

@@ -13,16 +13,16 @@ module Spina
 
       def new
         @user = User.new
-        add_breadcrumb "Nieuwe gebruiker"
+        add_breadcrumb I18n.t('spina.users.new')
       end
 
       def create
         @user = User.new(user_params)
-        add_breadcrumb "Nieuwe gebruiker"
+        add_breadcrumb I18n.t('spina.users.new')
         if @user.save
-          redirect_to admin_users_url, notice: "Gebruiker #{@user} is aangemaakt."
+          redirect_to admin_users_url
         else
-          flash.now[:alert] = "De gebruiker kan nog niet worden opgeslagen."
+          flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
           render :new
         end
       end
@@ -38,7 +38,7 @@ module Spina
         if @user.update_attributes(user_params)
           redirect_to spina.admin_users_url
         else
-          flash.now[:alert] = "De gebruiker kan nog worden opgeslagen."
+          flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
           render :edit
         end
       end
@@ -46,13 +46,13 @@ module Spina
       def destroy
         @user = User.find(params[:id])
         @user.destroy unless @user == current_user
-        redirect_to admin_users_url, notice: "De gebruiker is verwijderd."
+        redirect_to admin_users_url
       end
 
       private
 
       def set_breadcrumbs
-        add_breadcrumb "Gebruikers", spina.admin_users_path
+        add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
       end
 
       def user_params

data/app/models/spina/user.rb

@@ -5,7 +5,7 @@ module Spina
     validates_presence_of :name, :email
     validates_presence_of :password, on: :create
     validate :uniqueness_of_email
-    validates :email, format: { with:/\A[^@]+@[^@]+\z/, message: 'is geen geldig emailadres' }
+    validates :email, format: { with:/\A[^@]+@[^@]+\z/ }
 
     def admin?
       admin

data/app/views/layouts/spina/admin/application.html.haml

@@ -25,7 +25,7 @@
       %header#main_content_header
         = yield(:permanent_notice) if content_for?(:permanent_notice)
         .pull-right
-          = link_to "Bekijk je website", "/", class: 'button button-hollow button-round button-small', data: {:"no-turbolink" => true, icon: "W"}
+          = link_to t('spina.preview_website'), "/", class: 'button button-hollow button-round button-small', data: {:"no-turbolink" => true, icon: "W"}
         .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
         = yield(:tertiary_navigation) if content_for?(:tertiary_navigation)
 

data/app/views/layouts/spina/admin/media_library.html.haml

@@ -2,11 +2,9 @@
   %nav.tabs
     %ul
       %li{class: ('active' if controller_name == "photos")}
-        = link_to spina.admin_photos_path do
-          Afbeeldingen
+        = link_to Spina::Photo.model_name.human(count: 2), spina.admin_photos_path
       %li{class: ('active' if controller_name == "attachments")}
-        = link_to spina.admin_attachments_path do
-          Documenten
+        = link_to Spina::Attachment.model_name.human(count: 2), spina.admin_attachments_path
 
 - content_for :website_content do
   = yield

data/app/views/layouts/spina/admin/messages.html.haml

@@ -1,20 +1,20 @@
 - content_for :secondary_navigation do
   %nav#secondary
-    %h1 Berichten
+    %h1= Spina::Inquiry.model_name.human(count: 2)
 
     %ul
       %li{class: ('active' if ["inbox", "inbox_show"].include? action_name )}
         = link_to spina.inbox_admin_inquiries_path, data: {icon: 'b'} do
           - if @new_messages.present?
-            = "Inbox (#{@new_messages.size})"
+            = "#{t('spina.inquiries.inbox')} (#{@new_messages.size})"
           - else
-            Inbox
-          %small Binnenkomende berichten
+            = t('spina.inquiries.inbox')
+          %small= t('spina.inquiries.inbox_description')
           
       %li{class: ('active' if ["index", "spam", "show"].include? action_name )}
         = link_to spina.admin_inquiries_path, data: {icon: 'z'} do
-          Alle berichten
-          %small Alle berichten
+          = t('spina.inquiries.all')
+          %small= t('spina.inquiries.all_description')
 
 - content_for :content do
   = yield

data/app/views/layouts/spina/admin/settings.html.haml

@@ -1,28 +1,28 @@
 - content_for :secondary_navigation do
   %nav#secondary
-    %h1 Voorkeuren
+    %h1= t('spina.preferences.title')
 
     %ul
       %li{class: ('active' if params[:action] == 'edit' && params[:controller] == 'spina/admin/accounts')}
         = link_to spina.edit_admin_account_path, data: {icon: 'J'} do
-          Algemene gegevens
-          %small Persoonlijke instellingen
+          = t('spina.preferences.account')
+          %small= t('spina.preferences.account_description')
 
       - if can? :manage, Spina::User
         %li{class: ('active' if %w[users].include? controller_name)}
           = link_to spina.admin_users_path, data: {icon: 'K'} do
-            Gebruikers
-            %small Beheer gebruikers en beheerders
+            = t('spina.preferences.users')
+            %small= t('spina.preferences.users_description')
 
       %li{class: ('active' if params[:action] == 'social')}
         = link_to spina.social_admin_account_path, data: {icon: 'D'} do
-          Social media
-          %small Facebook en Twitter accounts
+          = t('spina.preferences.social_media')
+          %small= t('spina.preferences.social_media_description')
 
       %li{class: ('active' if params[:action] == 'analytics')}
         = link_to spina.analytics_admin_account_path, data: {icon: 'E'} do
-          Statistieken en zoekmachines
-          %small Koppel je account voor real-time statistieken
+          = t('spina.preferences.analytics')
+          %small= t('spina.preferences.analytics_description')
 
 - content_for :content do
   = yield

data/app/views/layouts/spina/admin/website.html.haml

@@ -1,17 +1,17 @@
 - content_for :secondary_navigation do
   %nav#secondary
-    %h1 Je website
+    %h1= t('spina.website.title')
 
     %ul
       %li{class: ('active' if params[:controller] == "spina/admin/pages")}
         = link_to spina.admin_pages_path, data: {icon: 'B'} do
-          Pagina's
-          %small Alle pagina's op je website
+          = t('spina.website.pages')
+          %small= t('spina.website.pages_description')
 
       %li{class: ('active' if params[:controller] == "spina/admin/photos" || params[:controller] == "spina/admin/attachments")}
         = link_to spina.admin_photos_path, data: {icon: 'N'} do
-          Mediabibliotheek
-          %small Hier staan al je afbeeldingen, video's en documenten
+          = t('spina.website.media_library')
+          %small= t('spina.website.media_library_description')
 
       - Spina.plugins(:website_resource).each do |plugin|
         - if current_theme.config.plugins.include? plugin.name.downcase

data/app/views/layouts/spina/login.html.haml

@@ -5,7 +5,7 @@
     %meta{name: 'viewport', content: 'initial-scale=1.0, user-scalable=no'}
     = csrf_meta_tags
 
-    %title denkWebsite
+    %title SpinaCMS
 
     / Stylesheet
     = stylesheet_link_tag "spina/admin/application"

data/app/views/spina/admin/accounts/_form.html.haml

@@ -3,53 +3,53 @@
     %table.table.table-form
       %tr
         %td
-          %label Naam website
+          = Spina::Account.human_attribute_name(:name)
         %td
-          = f.text_field :name, placeholder: "Naam van je website"
+          = f.text_field :name, placeholder: Spina::Account.human_attribute_name(:name)
 
       %tr
         %td
-          %label Adres
+          = Spina::Account.human_attribute_name(:address)
         %td
-          = f.text_field :address, placeholder: "Straat en huisnummer"
+          = f.text_field :address, placeholder: Spina::Account.human_attribute_name(:address)
 
       %tr
         %td
-          %label Postcode
+          = Spina::Account.human_attribute_name(:postal_code)
         %td
-          = f.text_field :postal_code, placeholder: "Postcode"
+          = f.text_field :postal_code, placeholder: Spina::Account.human_attribute_name(:postal_code)
 
       %tr
         %td
-          %label Plaats
+          = Spina::Account.human_attribute_name(:city)
         %td
-          = f.text_field :city, placeholder: "Plaats"
+          = f.text_field :city, placeholder: Spina::Account.human_attribute_name(:city)
 
       %tr
         %td
-          %label Telefoonnummer
+          = Spina::Account.human_attribute_name(:phone)
         %td
-          = f.text_field :phone, placeholder: "Telefoonnummer"
+          = f.text_field :phone, placeholder: Spina::Account.human_attribute_name(:phone)
 
       %tr
         %td
-          %label Email
+          = Spina::Account.human_attribute_name(:email)
         %td
-          = f.text_field :email, placeholder: "Emailadres"
+          = f.text_field :email, placeholder: Spina::Account.human_attribute_name(:email)
 
       %tr
         %td
-          %label KvK-nummer
-          %small Het is verplicht je KvK-nummer te vermelden op je website
+          = Spina::Account.human_attribute_name(:kvk_identifier)
+          %small= Spina::Account.human_attribute_name(:kvk_identifier_description)
         %td
-          = f.text_field :kvk_identifier, placeholder: "KvK-nummer"
+          = f.text_field :kvk_identifier, placeholder: Spina::Account.human_attribute_name(:kvk_identifier)
 
       %tr
         %td
-          %label BTW-nummer
-          %small Het is verplicht je BTW-nummer te vermelden op je website
+          = Spina::Account.human_attribute_name(:vat_identifier)
+          %small= Spina::Account.human_attribute_name(:vat_identifier_description)
         %td
-          = f.text_field :vat_identifier, placeholder: "BTW-nummer"
+          = f.text_field :vat_identifier, placeholder: Spina::Account.human_attribute_name(:vat_identifier)
 
   %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
-    Gegevens opslaan
+    = t('spina.preferences.account_save')