From f856cd78bb0172d3b10956183bd810c2ca48d133 Mon Sep 17 00:00:00 2001 From: f Date: Thu, 12 Sep 2019 13:57:25 -0300 Subject: [PATCH] traduccion de pull --- app/views/i18n/edit.haml | 2 +- app/views/posts/edit.haml | 2 +- app/views/posts/index.haml | 2 +- app/views/posts/new.haml | 2 +- app/views/posts/show.haml | 2 +- app/views/sites/edit.haml | 2 +- app/views/sites/fetch.haml | 2 +- app/views/sites/index.haml | 35 +++++++++++++++++----------------- app/views/sites/new.haml | 2 +- app/views/stats/index.haml | 2 +- app/views/usuaries/invite.haml | 2 +- config/locales/en.yml | 4 +++- config/locales/es.yml | 4 +++- 13 files changed, 33 insertions(+), 30 deletions(-) diff --git a/app/views/i18n/edit.haml b/app/views/i18n/edit.haml index c8e35e3..3e44af6 100644 --- a/app/views/i18n/edit.haml +++ b/app/views/i18n/edit.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), link_to(@site.name, site_path(@site)), t('i18n.index'), t('i18n.edit')] diff --git a/app/views/posts/edit.haml b/app/views/posts/edit.haml index 6477f37..282d9d0 100644 --- a/app/views/posts/edit.haml +++ b/app/views/posts/edit.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), link_to(@site.name, site_posts_path(@site)), link_to(t('posts.index'), site_posts_path(@site)), link_to(@post.title.value, site_post_path(@site, @post.id)), diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml index cea14f9..b760928 100644 --- a/app/views/posts/index.haml +++ b/app/views/posts/index.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), @site.name, link_to(t('posts.index'), site_posts_path(@site)), diff --git a/app/views/posts/new.haml b/app/views/posts/new.haml index 31df261..adcc843 100644 --- a/app/views/posts/new.haml +++ b/app/views/posts/new.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), @site.name, link_to(t('posts.index'), site_posts_path(@site)), t('posts.new')] diff --git a/app/views/posts/show.haml b/app/views/posts/show.haml index 0b493af..b8f9caf 100644 --- a/app/views/posts/show.haml +++ b/app/views/posts/show.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), @site.name, link_to(t('posts.index'), site_posts_path(@site)), @post.title.value] diff --git a/app/views/sites/edit.haml b/app/views/sites/edit.haml index 5740b0f..7edbb05 100644 --- a/app/views/sites/edit.haml +++ b/app/views/sites/edit.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), t('.title', site: @site.name)] .row .col diff --git a/app/views/sites/fetch.haml b/app/views/sites/fetch.haml index 224da18..6a16e2e 100644 --- a/app/views/sites/fetch.haml +++ b/app/views/sites/fetch.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), t('.title')] + crumbs: [link_to(t('sites.index.title'), sites_path), t('.title')] .row.justify-content-center .col-md-8#pull diff --git a/app/views/sites/index.haml b/app/views/sites/index.haml index a105506..2587411 100644 --- a/app/views/sites/index.haml +++ b/app/views/sites/index.haml @@ -1,9 +1,9 @@ -= render 'layouts/breadcrumb', crumbs: [t('sites.index')] += render 'layouts/breadcrumb', crumbs: [t('sites.index.title')] .row .col %h1 - = t('sites.title') + = t('.title') - if policy(Site).new? = link_to t('sites.new.title'), new_site_path, class: 'btn' @@ -57,25 +57,24 @@ text: t('usuaries.index.title'), type: 'info', link: site_usuaries_path(site) - - if policy(site).build? - - if site.enqueued? - = render 'layouts/btn_with_tooltip', - tooltip: t('help.sites.enqueued'), - text: t('sites.enqueued'), - type: 'secondary', - link: nil - - else - = form_tag site_enqueue_path(site), - method: :post, class: 'form-inline' do - = button_tag type: 'submit', - class: 'btn btn-success', - title: t('help.sites.enqueue'), - data: { toggle: 'tooltip' } do - = t('sites.enqueue') - - if policy(site).pull? && site.repository.needs_pull? = render 'layouts/btn_with_tooltip', tooltip: t('help.sites.pull'), text: t('.pull'), type: 'info', link: site_pull_path(site) + - if policy(site).build? + - if site.enqueued? + = render 'layouts/btn_with_tooltip', + tooltip: t('help.sites.enqueued'), + text: t('.enqueued'), + type: 'secondary', + link: nil + - else + = form_tag site_enqueue_path(site), + method: :post, class: 'form-inline' do + = button_tag type: 'submit', + class: 'btn no-border-radius', + title: t('help.sites.enqueue'), + data: { toggle: 'tooltip' } do + = t('sites.enqueue') diff --git a/app/views/sites/new.haml b/app/views/sites/new.haml index 40bad24..f4efbea 100644 --- a/app/views/sites/new.haml +++ b/app/views/sites/new.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), t('.title')] + crumbs: [link_to(t('sites.index.title'), sites_path), t('.title')] .row .col diff --git a/app/views/stats/index.haml b/app/views/stats/index.haml index 347a80c..dd36df3 100644 --- a/app/views/stats/index.haml +++ b/app/views/stats/index.haml @@ -1,5 +1,5 @@ = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), link_to(@site.name, site_path(@site)), t('.title')] .row diff --git a/app/views/usuaries/invite.haml b/app/views/usuaries/invite.haml index a205b2e..3243977 100644 --- a/app/views/usuaries/invite.haml +++ b/app/views/usuaries/invite.haml @@ -1,7 +1,7 @@ - invite_as = t("usuaries.invite_as.#{params[:invite_as]}") = render 'layouts/breadcrumb', - crumbs: [link_to(t('sites.index'), sites_path), + crumbs: [link_to(t('sites.index.title'), sites_path), @site.name, link_to(t('posts.index'), site_usuaries_path(@site)), t('.title', invite_as: invite_as)] diff --git a/config/locales/en.yml b/config/locales/en.yml index 92d1521..24a3c5d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -229,12 +229,14 @@ en: average: 'Average building time' maximum: 'Maximum building time' sites: + index: + title: 'Sites' + pull: 'Upgrade' repository: config: 'Changes in config' actions: 'Actions' posts: 'View and edit posts' title: 'Sites' - index: 'Sites' enqueued: 'Waiting for build' enqueue: 'Build' failed: 'Failed!' diff --git a/config/locales/es.yml b/config/locales/es.yml index 86587d2..9346d96 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -231,12 +231,14 @@ es: average: 'Tiempo promedio de generación' maximum: 'Tiempo máximo de generación' sites: + index: + title: 'Sitios' + pull: 'Actualizar' repository: config: 'Cambios en la configuración' actions: 'Acciones' posts: 'Ver y editar artículos' title: 'Sitios' - index: 'Sitios' enqueued: 'Esperando compilación' enqueue: 'Compilar' failed: '¡Falló!'