diff --git a/app/helpers/admin/content_types_helper.rb b/app/helpers/admin/content_types_helper.rb index 377fb024..bd6b5f58 100644 --- a/app/helpers/admin/content_types_helper.rb +++ b/app/helpers/admin/content_types_helper.rb @@ -6,7 +6,7 @@ module Admin::ContentTypesHelper return @content_types if @content_types @content_types = current_site.content_types.ordered. - limit(:contents => Locomotive.config.lastest_items_nb). + limit(:contents => Locomotive.config.latest_items_nb). only(:site_id, :name, :slug, :highlighted_field_name, :content_custom_fields_version, :order_by, :serialized_item_template, :raw_item_template).to_a if @content_type && @content_type.persisted? && @content_types.index(@content_type) >= MAX_DISPLAYED_CONTENTS diff --git a/app/models/content_instance.rb b/app/models/content_instance.rb index 2486522b..fb506cb3 100644 --- a/app/models/content_instance.rb +++ b/app/models/content_instance.rb @@ -26,7 +26,7 @@ class ContentInstance after_create :send_notifications ## named scopes ## - scope :latest_updated, :order_by => :updated_at.desc, :limit => Locomotive.config.lastest_items_nb + scope :latest_updated, :order_by => :updated_at.desc, :limit => Locomotive.config.latest_items_nb ## methods ## diff --git a/app/models/page.rb b/app/models/page.rb index 733e3358..56901ed9 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -40,7 +40,7 @@ class Page validates_exclusion_of :slug, :in => Locomotive.config.reserved_slugs, :if => Proc.new { |p| p.depth == 0 } ## named scopes ## - scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.lastest_items_nb + scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.latest_items_nb scope :root, :where => { :slug => 'index', :depth => 0 } scope :not_found, :where => { :slug => '404', :depth => 0 } scope :published, :where => { :published => true } diff --git a/app/views/admin/shared/menu/_contents.html.haml b/app/views/admin/shared/menu/_contents.html.haml index 51dff9e2..a3882028 100644 --- a/app/views/admin/shared/menu/_contents.html.haml +++ b/app/views/admin/shared/menu/_contents.html.haml @@ -3,7 +3,7 @@ .header %p= link_to t('admin.pages.index.new'), new_admin_page_url .inner - %h2!= t('admin.pages.index.lastest_items') + %h2!= t('admin.pages.index.latest_items') %ul - current_site.pages.latest_updated.minimal_attributes.each do |page| %li @@ -18,7 +18,7 @@ %p.edit= link_to t('admin.contents.index.edit'), edit_admin_content_type_url(content_type) .inner - %h2!= t('admin.contents.index.lastest_items') + %h2!= t('admin.contents.index.latest_items') %ul - content_type.latest_updated_contents.each do |content| %li diff --git a/config/initializers/locomotive.rb b/config/initializers/locomotive.rb index c61fb70d..18a0119d 100644 --- a/config/initializers/locomotive.rb +++ b/config/initializers/locomotive.rb @@ -46,7 +46,7 @@ Locomotive.configure do |config| config.delayed_job = false # configure how many items we display in sub menu in the "Contents" section. - # config.lastest_items_nb = 5 + # config.latest_items_nb = 5 # default locale (for now, only en, de, fr, pt-BR and it are supported) config.default_locale = :en diff --git a/config/locales/admin_ui.de.yml b/config/locales/admin_ui.de.yml index fd582635..bef2dc17 100644 --- a/config/locales/admin_ui.de.yml +++ b/config/locales/admin_ui.de.yml @@ -101,7 +101,7 @@ de: help: "Seiten sind als Baum organisiert. Du kannst die Seiten also wie Ordner sortieren und verschachteln." no_items: "Momentan gibt es keine Seiten. Klicke einfach hier, um die erste Seite zu erstellen." new: neue Seite - lastest_items: Neueste Seiten + latest_items: Neueste Seiten new: title: Neue Seite help: "Fülle das folgende Formular aus, um eine neue Seite zu erstellen. Nur zur Info: Die Seite wird nicht standardmäßig publiziert!" @@ -244,7 +244,7 @@ de: download: Elemente herunterladen new: neues Element category_noname: "Kein Name" - lastest_items: "Neueste Elemente" + latest_items: "Neueste Elemente" updated_at: "Aktualisiert am" list: no_items: "Momentan gibt es keine Elemente. Klicke einfach hier, um das erste Element zu erstellen." diff --git a/config/locales/admin_ui.en.yml b/config/locales/admin_ui.en.yml index 511461d4..2f0d66db 100644 --- a/config/locales/admin_ui.en.yml +++ b/config/locales/admin_ui.en.yml @@ -101,7 +101,7 @@ en: help: "Pages are organized as a tree. You can order pages as well as folders" no_items: "There are no pages for now. Just click here to create the first one." new: new page - lastest_items: Lastest pages + latest_items: Latest pages new: title: New page help: "Please fill in the below form to create your page. Be careful, by default, the page is not published." @@ -245,7 +245,7 @@ en: download: download items new: new item category_noname: "No name" - lastest_items: "Lastest items" + latest_items: "Lastest items" updated_at: "Updated at" list: no_items: "There are no items for now. Just click here to create the first one." diff --git a/config/locales/admin_ui.es.yml b/config/locales/admin_ui.es.yml index 656a5675..7c136c37 100644 --- a/config/locales/admin_ui.es.yml +++ b/config/locales/admin_ui.es.yml @@ -99,7 +99,7 @@ es: no_items: "No se ha creado ninguna página aún. Pulse aquí to para crear la primera." new: Nueva página - lastest_items: Últimas páginas + latest_items: Últimas páginas new: title: Nueva página help: "Por favor rellene el formulario de más abajo para crear su página. ¡Atención! Las páginas, por defecto, están 'no publicadas'." @@ -244,7 +244,7 @@ es: download: descargar elementos new: nuevo elemento category_noname: "Sin nombre" - lastest_items: "Últimos elementos" + latest_items: "Últimos elementos" updated_at: "Última actualización" list: no_items: "No hay ningún elemento. Haga click aquí para crear el primero." diff --git a/config/locales/admin_ui.fr.yml b/config/locales/admin_ui.fr.yml index 067f4398..123d66b1 100644 --- a/config/locales/admin_ui.fr.yml +++ b/config/locales/admin_ui.fr.yml @@ -101,7 +101,7 @@ fr: help: "Les pages sont organisées sous forme d'un arbre. Vous pouvez classes les pages ainsi que les dossiers." no_items: "Il n'existe pas de page. Vous pouvez commencer par créer une ici." new: nouvelle page - lastest_items: Dernières pages + latest_items: Dernières pages new: title: Nouvelle page help: "Remplissez le formulaire ci-dessous pour créer votre page. Attention, par défaut, la page n'est pas publiée." @@ -248,7 +248,7 @@ fr: download: télécharger éléments new: nouvel élément category_noname: "Pas de nom" - lastest_items: "Eléments récents" + latest_items: "Eléments récents" updated_at: "Mis à jour le" list: no_items: "Il n'existe pas d'éléments. Vous pouvez commencer par créer un ici" diff --git a/config/locales/admin_ui.it.yml b/config/locales/admin_ui.it.yml index a03dc757..46a6a575 100644 --- a/config/locales/admin_ui.it.yml +++ b/config/locales/admin_ui.it.yml @@ -99,7 +99,7 @@ it: help: "Le pagine sono organizzate ad albero. Puoi ordinarle come se fossero delle cartelle" no_items: "Per ora non ci sono pagine. Clicca qui per creare la prima pagina." new: nuova pagina - lastest_items: Ultime pagine + latest_items: Ultime pagine new: title: Nuova pagina help: "Prego, compila il seguente modulo per creare la tua pagina. Fai attenzione, per default, la pagina non è pubblicata." @@ -243,7 +243,7 @@ it: download: scarica elementi new: nuovo elemento category_noname: "Senza nome" - lastest_items: "Ultimi elementi" + latest_items: "Ultimi elementi" updated_at: "modificato il" list: no_items: "Per ora non ci sono elementi. Clicca qui per creare il primo." diff --git a/config/locales/admin_ui.nl.yml b/config/locales/admin_ui.nl.yml index 15dcc3a0..c8843ca6 100644 --- a/config/locales/admin_ui.nl.yml +++ b/config/locales/admin_ui.nl.yml @@ -91,7 +91,7 @@ nl: help: "Pagina's zijn georganiseerd als een boom. U kunt zowel pagina's als mappen ordenen" no_items: "Er zijn momenteel geen pagina's. Klik hier om de eerste pagina te maken." new: Nieuwe pagina - lastest_items: Laatste pagina's + latest_items: Laatste pagina's new: title: Nieuwe pagina help: "Voer onderstaande formulier in om uw pagina te maken. Opgelet, de pagina is niet gepubliseerd" @@ -227,7 +227,7 @@ nl: download: download items new: nieuw item category_noname: "Geen naam" - lastest_items: "Laatste items" + latest_items: "Laatste items" updated_at: "Gewijzigd op" list: no_items: "Er zijn momenteel geen items. Klik hier here om de eerste te maken." diff --git a/config/locales/admin_ui.no.yml b/config/locales/admin_ui.no.yml index 3e6ac46d..696b0f88 100644 --- a/config/locales/admin_ui.no.yml +++ b/config/locales/admin_ui.no.yml @@ -101,7 +101,7 @@ help: "Sidene er organisert i en trestruktur. Du kan sortere både sider og mapper." no_items: "Det har ikke blitt opprettet noen sider ennå. Klikk her for lage den første." new: ny side - lastest_items: Siste sider + latest_items: Siste sider new: title: Ny side help: "Fyll ut skjemaet nedenfor for å opprette en ny side. Publisering er skrudd av som standard." @@ -245,7 +245,7 @@ download: last ned elementer new: nytt element category_noname: "Navn mangler" - lastest_items: "Siste elementer" + latest_items: "Siste elementer" updated_at: "Sist oppdatert" list: no_items: "Det har ikke blitt opprettet noen elementer her ennå. Klikk her for å opprette det første." diff --git a/config/locales/admin_ui.pt-BR.yml b/config/locales/admin_ui.pt-BR.yml index 267806d9..f3684336 100644 --- a/config/locales/admin_ui.pt-BR.yml +++ b/config/locales/admin_ui.pt-BR.yml @@ -90,7 +90,7 @@ pt-BR: help: "As páginas são organizadas como uma árvore. Você pode reordenar as páginas como se fossem pastas" no_items: "Não existe nenhuma página ainda. Clique aqui para criar a primeira." new: nova página - lastest_items: Últmas páginas + latest_items: Últmas páginas new: title: Nova página help: "Por favor, preencha o formulário a seguir para criar sua página. Atenção: Por padrão a página não é publicada." @@ -223,7 +223,7 @@ pt-BR: download: download dos itens new: novo item category_noname: "Sem nome" - lastest_items: "Últimos itens" + latest_items: "Últimos itens" updated_at: "Atualizado em" list: no_items: "Não existem itens ainda. Clique aqui para criar o primeiro." diff --git a/config/locales/admin_ui.ru.yml b/config/locales/admin_ui.ru.yml index 8ec013c5..1aac8328 100644 --- a/config/locales/admin_ui.ru.yml +++ b/config/locales/admin_ui.ru.yml @@ -101,7 +101,7 @@ ru: help: "Страницы организованы в виде дерева. Вы можете сортировать как страницы, так и папки" no_items: "There are no pages for now. Just click here to create the first one." new: новая страница - lastest_items: Страницы за последнее время + latest_items: Страницы за последнее время new: title: Новая страница help: "Заполните форму, приведенную ниже, для создания страницы. Будьте осторожны, по умолчанию, страница не опубликована." @@ -244,7 +244,7 @@ ru: download: скачать элементы new: новый элемент category_noname: "Без имени" - lastest_items: "Элементы за последнее время" + latest_items: "Элементы за последнее время" updated_at: "Обновлено" list: no_items: "На данный момент нет ни одного элемента. Нажмите здесь для создания первого элемента." diff --git a/lib/generators/locomotive/install/templates/locomotive.rb b/lib/generators/locomotive/install/templates/locomotive.rb index def55739..977c4b3a 100644 --- a/lib/generators/locomotive/install/templates/locomotive.rb +++ b/lib/generators/locomotive/install/templates/locomotive.rb @@ -44,7 +44,7 @@ Locomotive.configure do |config| config.delayed_job = false # configure how many items we display in sub menu in the "Contents" section. - # config.lastest_items_nb = 5 + # config.latest_items_nb = 5 # default locale (for now, only en, de, fr, pt-BR and it are supported) config.default_locale = :en diff --git a/lib/locomotive/configuration.rb b/lib/locomotive/configuration.rb index 894aceff..8961e7df 100644 --- a/lib/locomotive/configuration.rb +++ b/lib/locomotive/configuration.rb @@ -16,7 +16,7 @@ module Locomotive :mailer_sender => 'support', #support@example.com' :manage_subdomain => false, :manage_manage_domains => false, - :lastest_items_nb => 5, + :latest_items_nb => 5, :rack_cache => { :verbose => true, :metastore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces