diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index d2f9db426..fdbe80070 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -13,10 +13,10 @@ class Admin::InvoicesController < AdminController def cancel if @invoice.cancel - flash[:notice] = t('record_updated') + flash[:notice] = t(:record_updated) redirect_to([:admin, @invoice]) else - flash.now[:alert] = t('failed_to_update_record') + flash.now[:alert] = t(:failed_to_update_record) render :show end end diff --git a/app/controllers/epp/errors_controller.rb b/app/controllers/epp/errors_controller.rb index cefa026a0..cba923bc9 100644 --- a/app/controllers/epp/errors_controller.rb +++ b/app/controllers/epp/errors_controller.rb @@ -7,7 +7,7 @@ class Epp::ErrorsController < EppController end def not_found - epp_errors << { code: 2400, msg: t('could_not_determine_object_type_check_xml_format_and_namespaces') } + epp_errors << { code: 2400, msg: t(:could_not_determine_object_type_check_xml_format_and_namespaces) } render_epp_response '/epp/error' end end diff --git a/app/controllers/registrar/deposits_controller.rb b/app/controllers/registrar/deposits_controller.rb index 1f1bafd00..6f1dfff13 100644 --- a/app/controllers/registrar/deposits_controller.rb +++ b/app/controllers/registrar/deposits_controller.rb @@ -10,10 +10,10 @@ class Registrar::DepositsController < RegistrarController @invoice = @deposit.issue_prepayment_invoice if @invoice.persisted? - flash[:notice] = t('please_pay_the_following_invoice') + flash[:notice] = t(:please_pay_the_following_invoice) redirect_to [:registrar, @invoice] else - flash[:alert] = t('failed_to_create_record') + flash[:alert] = t(:failed_to_create_record) render 'new' end end diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb index df616cc16..5a62c5ad5 100644 --- a/app/controllers/registrar/domains_controller.rb +++ b/app/controllers/registrar/domains_controller.rb @@ -23,7 +23,7 @@ class Registrar::DomainsController < Registrar::DeppController # EPP controller if response_ok? render 'info' else - flash[:alert] = t('domain_not_found') + flash[:alert] = t(:domain_not_found) redirect_to registrar_domains_url and return end end diff --git a/app/controllers/registrar/nameservers_controller.rb b/app/controllers/registrar/nameservers_controller.rb index bda879862..68c1dbfee 100644 --- a/app/controllers/registrar/nameservers_controller.rb +++ b/app/controllers/registrar/nameservers_controller.rb @@ -13,13 +13,13 @@ class Registrar::NameserversController < RegistrarController ) if prc == 'replaced_none' - flash.now[:alert] = t('no_hostnames_replaced') + flash.now[:alert] = t(:no_hostnames_replaced) elsif prc == 'replaced_all' params[:q][:hostname_end] = params[:hostname_end_replacement] params[:hostname_end_replacement] = nil - flash.now[:notice] = t('all_hostnames_replaced') + flash.now[:notice] = t(:all_hostnames_replaced) else - flash.now[:warning] = t('hostnames_partially_replaced') + flash.now[:warning] = t(:hostnames_partially_replaced) end end diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index b82fe43bc..4623effd6 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -39,9 +39,9 @@ class Registrar::SessionsController < ::SessionsController if @user.persisted? session[:user_id_code] = response.user_id_code session[:mid_session_code] = client.session_code - render json: { message: t('check_your_phone_for_confirmation_code') }, status: :ok + render json: { message: t(:check_your_phone_for_confirmation_code) }, status: :ok else - render json: { message: t('no_such_user') }, status: :unauthorized + render json: { message: t(:no_such_user) }, status: :unauthorized end end @@ -55,31 +55,31 @@ class Registrar::SessionsController < ::SessionsController case auth_status.status when 'OUTSTANDING_TRANSACTION' - render json: { message: t('check_your_phone_for_confirmation_code') }, status: :ok + render json: { message: t(:check_your_phone_for_confirmation_code) }, status: :ok when 'USER_AUTHENTICATED' @user = find_user_by_idc(session[:user_id_code]) sign_in @user - flash[:notice] = t('welcome') + flash[:notice] = t(:welcome) flash.keep(:notice) render js: "window.location = '#{registrar_root_path}'" when 'NOT_VALID' - render json: { message: t('user_signature_is_invalid') }, status: :bad_request + render json: { message: t(:user_signature_is_invalid) }, status: :bad_request when 'EXPIRED_TRANSACTION' - render json: { message: t('session_timeout') }, status: :bad_request + render json: { message: t(:session_timeout) }, status: :bad_request when 'USER_CANCEL' - render json: { message: t('user_cancelled') }, status: :bad_request + render json: { message: t(:user_cancelled) }, status: :bad_request when 'MID_NOT_READY' - render json: { message: t('mid_not_ready') }, status: :bad_request + render json: { message: t(:mid_not_ready) }, status: :bad_request when 'PHONE_ABSENT' - render json: { message: t('phone_absent') }, status: :bad_request + render json: { message: t(:phone_absent) }, status: :bad_request when 'SENDING_ERROR' - render json: { message: t('sending_error') }, status: :bad_request + render json: { message: t(:sending_error) }, status: :bad_request when 'SIM_ERROR' - render json: { message: t('sim_error') }, status: :bad_request + render json: { message: t(:sim_error) }, status: :bad_request when 'INTERNAL_ERROR' - render json: { message: t('internal_error') }, status: :bad_request + render json: { message: t(:internal_error) }, status: :bad_request else - render json: { message: t('internal_error') }, status: :bad_request + render json: { message: t(:internal_error) }, status: :bad_request end end # rubocop: enable Metrics/PerceivedComplexity diff --git a/app/views/admin/bank_statements/index.haml b/app/views/admin/bank_statements/index.haml index f82783df4..afb3a7be1 100644 --- a/app/views/admin/bank_statements/index.haml +++ b/app/views/admin/bank_statements/index.haml @@ -9,14 +9,14 @@ %thead %tr %th{class: 'col-xs-3'} - = sort_link(@q, 'created_at', t('imported_at')) + = sort_link(@q, 'created_at', t(:imported_at)) %th{class: 'col-xs-3'} = sort_link(@q, 'bank_code') %th{class: 'col-xs-3'} = sort_link(@q, 'iban', t('iban').upcase) / TODO: Make this searchable by caching the status to the database %th{class: 'col-xs-3'} - = t('status') + = t(:status) %tbody - @bank_statements.each do |x| %tr diff --git a/app/views/admin/bank_transactions/edit.haml b/app/views/admin/bank_transactions/edit.haml index 5985f3e3a..5c38ea6e0 100644 --- a/app/views/admin/bank_transactions/edit.haml +++ b/app/views/admin/bank_transactions/edit.haml @@ -1,5 +1,5 @@ - content_for :actions do - = link_to(t('back'), admin_bank_transaction_path(@bank_transaction), class: 'btn btn-default') + = link_to(t(:back), admin_bank_transaction_path(@bank_transaction), class: 'btn btn-default') = render 'shared/title', name: t(:bank_transaction) = form_for([:admin, @bank_transaction], html: { class: 'form-horizontal' }) do |f| @@ -11,7 +11,7 @@ = f.label :status, class: 'col-md-2 control-label' - c = @bank_transaction.binded? ? 'text-success' : 'text-danger' .col-md-10.form-control-static{class: c} - = @bank_transaction.binded? ? t('binded') : t('not_binded') + = @bank_transaction.binded? ? t(:binded) : t(:not_binded) .form-group = f.label :description, class: 'col-md-2 control-label' @@ -71,4 +71,4 @@ %hr .row .col-md-8.text-right - = button_tag(t('save'), class: 'btn btn-primary') + = button_tag(t(:save), class: 'btn btn-primary') diff --git a/app/views/admin/bank_transactions/show.haml b/app/views/admin/bank_transactions/show.haml index 4a325ab53..7bcd8cfa1 100644 --- a/app/views/admin/bank_transactions/show.haml +++ b/app/views/admin/bank_transactions/show.haml @@ -1,5 +1,5 @@ - content_for :actions do - = link_to(t('edit'), edit_admin_bank_transaction_path(@bank_transaction), class: 'btn btn-primary') + = link_to(t(:edit), edit_admin_bank_transaction_path(@bank_transaction), class: 'btn btn-primary') = link_to(t('back_to_bank_statement'), admin_bank_statement_path(@bank_transaction.bank_statement), class: 'btn btn-default') = render 'shared/title', name: t(:bank_transaction) = render 'shared/full_errors', object: @bank_transaction @@ -10,52 +10,52 @@ %h3.panel-title= t(:details) .panel-body %dl.dl-horizontal - %dt= t('document_no') + %dt= t(:document_no) %dd= @bank_transaction.document_no - %dt= t('status') + %dt= t(:status) - c = @bank_transaction.binded? ? 'text-success' : 'text-danger' - %dd{class: c}= @bank_transaction.binded? ? t('binded') : t('not_binded') + %dd{class: c}= @bank_transaction.binded? ? t(:binded) : t(:not_binded) - %dt= t('bank_reference') + %dt= t(:bank_reference) %dd= @bank_transaction.bank_reference %dt= t('iban').upcase %dd= @bank_transaction.iban - %dt= t('buyer_bank_code') + %dt= t(:buyer_bank_code) %dd= @bank_transaction.buyer_bank_code - %dt= t('buyer_iban') + %dt= t(:buyer_iban) %dd= @bank_transaction.buyer_iban - %dt= t('buyer_name') + %dt= t(:buyer_name) %dd= @bank_transaction.buyer_name - %dt= t('description') + %dt= t(:description) %dd= @bank_transaction.description - %dt= t('sum') + %dt= t(:sum) %dd= @bank_transaction.sum - %dt= t('currency') + %dt= t(:currency) %dd= @bank_transaction.currency - %dt= t('reference_no') + %dt= t(:reference_no) %dd= @bank_transaction.reference_no - %dt= t('paid_at') + %dt= t(:paid_at) %dd= l(@bank_transaction.paid_at, format: :date_long) - if @bank_transaction.binded? - %dt= t('binded_invoice') + %dt= t(:binded_invoice) %dd= link_to(@bank_transaction.binded_invoice, admin_invoice_path(@bank_transaction.binded_invoice)) - unless @bank_transaction.binded? = form_for([:admin, @bank_transaction], url: {action: :bind}, html: { class: 'form-inline' }) do |f| .form-group %dl.dl-horizontal - %dt{style: 'padding-top: 5px'}= t('binded_invoice') + %dt{style: 'padding-top: 5px'}= t(:binded_invoice) %dd = text_field_tag(:invoice_no, params[:invoice_no], class: 'form-control') - = button_tag(t('bind_manually'), class: 'btn btn-primary') + = button_tag(t(:bind_manually), class: 'btn btn-primary') diff --git a/app/views/admin/certificates/show.haml b/app/views/admin/certificates/show.haml index e38b634bc..8be28ab8b 100644 --- a/app/views/admin/certificates/show.haml +++ b/app/views/admin/certificates/show.haml @@ -13,21 +13,21 @@ .panel.panel-default .panel-heading.clearfix .pull-left - = t('csr') + = t(:csr) .pull-right - = link_to(t('download'), download_csr_admin_api_user_certificate_path(@api_user, @certificate), class: 'btn btn-default btn-xs') + = link_to(t(:download), download_csr_admin_api_user_certificate_path(@api_user, @certificate), class: 'btn btn-default btn-xs') - unless @crt - = link_to(t('sign_this_request'), sign_admin_api_user_certificate_path(@api_user, @certificate), method: :post, class: 'btn btn-primary btn-xs') + = link_to(t(:sign_this_request), sign_admin_api_user_certificate_path(@api_user, @certificate), method: :post, class: 'btn btn-primary btn-xs') .panel-body %dl.dl-horizontal - %dt= t('version') + %dt= t(:version) %dd= @csr.version - %dt= t('subject') + %dt= t(:subject) %dd= @csr.subject - %dt= t('signature_algorithm') + %dt= t(:signature_algorithm) %dd= @csr.signature_algorithm - if @crt @@ -39,32 +39,32 @@ = t('crt') unless @certificate.revoked? = t('crt_revoked') if @certificate.revoked? .pull-right - = link_to(t('download'), download_crt_admin_api_user_certificate_path(@api_user, @certificate), class: 'btn btn-default btn-xs') + = link_to(t(:download), download_crt_admin_api_user_certificate_path(@api_user, @certificate), class: 'btn btn-default btn-xs') - unless @certificate.revoked? - = link_to(t('revoke_this_certificate'), revoke_admin_api_user_certificate_path(@api_user, @certificate), method: :post, class: 'btn btn-primary btn-xs') + = link_to(t(:revoke_this_certificate), revoke_admin_api_user_certificate_path(@api_user, @certificate), method: :post, class: 'btn btn-primary btn-xs') - if @crt .panel-body %dl.dl-horizontal - %dt= t('version') + %dt= t(:version) %dd= @crt.version - %dt= t('serial_number') + %dt= t(:serial_number) %dd= @crt.serial - %dt= t('signature_algorithm') + %dt= t(:signature_algorithm) %dd= @crt.signature_algorithm - %dt= t('issuer') + %dt= t(:issuer) %dd= @crt.issuer - %dt= t('valid_from') + %dt= t(:valid_from) %dd= @crt.not_before - %dt= t('valid_to') + %dt= t(:valid_to) %dd= @crt.not_after - %dt= t('subject') + %dt= t(:subject) %dd= @crt.subject - %dt= t('extensions') + %dt= t(:extensions) %dd= @crt.extensions.map(&:to_s).join('
').html_safe diff --git a/app/views/admin/contacts/partials/_domains.haml b/app/views/admin/contacts/partials/_domains.haml index 592bd976c..142c06397 100644 --- a/app/views/admin/contacts/partials/_domains.haml +++ b/app/views/admin/contacts/partials/_domains.haml @@ -1,12 +1,12 @@ #contacts.panel.panel-default - .panel-heading= t('domains') + .panel-heading= t(:domains) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('domain_name') - %th{class: 'col-xs-4'}= t('registrar') - %th{class: 'col-xs-4'}= t('valid_to') + %th{class: 'col-xs-4'}= t(:domain_name) + %th{class: 'col-xs-4'}= t(:registrar) + %th{class: 'col-xs-4'}= t(:valid_to) %tbody - @contact.domains_owned.each do |x| %tr diff --git a/app/views/admin/domain_versions/oldindex.haml b/app/views/admin/domain_versions/oldindex.haml index cc4d3d99a..15a57d0f7 100644 --- a/app/views/admin/domain_versions/oldindex.haml +++ b/app/views/admin/domain_versions/oldindex.haml @@ -1,6 +1,6 @@ -# .row -# .col-sm-12 - -# %h2.text-center-xs= t('domains') + -# %h2.text-center-xs= t(:domains) -# %hr -# .row -# .col-md-12 @@ -9,7 +9,7 @@ -# %thead -# %tr -# %th{class: 'col-xs-1'} - -# = t('name') + -# = t(:name) -# %th{class: 'col-xs-1'} -# = sort_link(@q, 'whodunnit') -# %th{class: 'col-xs-1'} diff --git a/app/views/admin/domains/_form.haml b/app/views/admin/domains/_form.haml index 54587125c..3e16d5f03 100644 --- a/app/views/admin/domains/_form.haml +++ b/app/views/admin/domains/_form.haml @@ -9,7 +9,7 @@ = render 'admin/domains/form_partials/statuses', f: f .row .col-md-8.text-right - = button_tag(t('save'), class: 'btn btn-primary') + = button_tag(t(:save), class: 'btn btn-primary') :coffee $ -> diff --git a/app/views/admin/domains/form_partials/_statuses.haml b/app/views/admin/domains/form_partials/_statuses.haml index a2354343b..7ae89a8da 100644 --- a/app/views/admin/domains/form_partials/_statuses.haml +++ b/app/views/admin/domains/form_partials/_statuses.haml @@ -2,10 +2,10 @@ = f.fields_for :domain_statuses, @server_statuses do |status_fields| .panel.panel-default .panel-heading.clearfix - .pull-left= t('status') + .pull-left= t(:status) .pull-right - = link_to(t('add_another'), '#', class: 'btn btn-primary btn-xs add-domain-status') - = link_to(t('delete'), '#', class: 'btn btn-danger btn-xs destroy') + = link_to(t(:add_another), '#', class: 'btn btn-primary btn-xs add-domain-status') + = link_to(t(:delete), '#', class: 'btn btn-danger btn-xs destroy') .panel-body .errors = render 'shared/errors', object: status_fields.object diff --git a/app/views/admin/domains/partials/_dnskeys.haml b/app/views/admin/domains/partials/_dnskeys.haml index f4c04a71d..6d5759e65 100644 --- a/app/views/admin/domains/partials/_dnskeys.haml +++ b/app/views/admin/domains/partials/_dnskeys.haml @@ -1,15 +1,15 @@ - panel_class = @domain.errors.messages[:dnskeys] ? 'panel-danger' : 'panel-default' #dnskeys.panel{class: panel_class} .panel-heading.clearfix - = t('dnskeys') + = t(:dnskeys) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-1'}= t('flag') - %th{class: 'col-xs-1'}= t('protocol') - %th{class: 'col-xs-1'}= t('algorithm') - %th{class: 'col-xs-9'}= t('public_key') + %th{class: 'col-xs-1'}= t(:flag) + %th{class: 'col-xs-1'}= t(:protocol) + %th{class: 'col-xs-1'}= t(:algorithm) + %th{class: 'col-xs-9'}= t(:public_key) %tbody - @domain.dnskeys.each do |x| %tr diff --git a/app/views/admin/domains/partials/_general.haml b/app/views/admin/domains/partials/_general.haml index b715330ab..17a6d5c45 100644 --- a/app/views/admin/domains/partials/_general.haml +++ b/app/views/admin/domains/partials/_general.haml @@ -1,22 +1,22 @@ .panel.panel-default .panel-heading - %h3.panel-title= t('general') + %h3.panel-title= t(:general) .panel-body %dl.dl-horizontal - %dt= t('name') + %dt= t(:name) %dd= @domain.name - %dt= t('registered_at') + %dt= t(:registered_at) %dd= l(@domain.registered_at) - %dt= t('registrar') + %dt= t(:registrar) %dd= link_to(@domain.registrar, root_path) - %dt= t('password') + %dt= t(:password) %dd= @domain.auth_info - %dt= t('valid_from') + %dt= t(:valid_from) %dd= l(@domain.valid_from) - %dt= t('valid_to') + %dt= t(:valid_to) %dd= l(@domain.valid_to) diff --git a/app/views/admin/domains/partials/_keyrelays.haml b/app/views/admin/domains/partials/_keyrelays.haml index 850abb9f0..43d099383 100644 --- a/app/views/admin/domains/partials/_keyrelays.haml +++ b/app/views/admin/domains/partials/_keyrelays.haml @@ -1,15 +1,15 @@ .panel{class: 'panel-default'} .panel-heading.clearfix - = t('keyrelays') + = t(:keyrelays) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('uploaded_at') - %th{class: 'col-xs-3'}= t('expiry') - %th{class: 'col-xs-2'}= t('requester') - %th{class: 'col-xs-2'}= t('accepter') - %th{class: 'col-xs-1'}= t('status') + %th{class: 'col-xs-4'}= t(:uploaded_at) + %th{class: 'col-xs-3'}= t(:expiry) + %th{class: 'col-xs-2'}= t(:requester) + %th{class: 'col-xs-2'}= t(:accepter) + %th{class: 'col-xs-1'}= t(:status) %tbody - @domain.keyrelays.includes([:requester, :accepter]).order(pa_date: :desc).each do |x| %tr diff --git a/app/views/admin/domains/partials/_legal_documents.haml b/app/views/admin/domains/partials/_legal_documents.haml index 5a25ae325..900a9784a 100644 --- a/app/views/admin/domains/partials/_legal_documents.haml +++ b/app/views/admin/domains/partials/_legal_documents.haml @@ -1,12 +1,12 @@ .panel.panel-default .panel-heading.clearfix - = t('legal_documents') + = t(:legal_documents) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-8'}= t('created_at') - %th{class: 'col-xs-4'}= t('type') + %th{class: 'col-xs-8'}= t(:created_at) + %th{class: 'col-xs-4'}= t(:type) %tbody - legal_documents.each do |x| %tr diff --git a/app/views/admin/domains/partials/_nameservers.haml b/app/views/admin/domains/partials/_nameservers.haml index 0b34986aa..db3ca759a 100644 --- a/app/views/admin/domains/partials/_nameservers.haml +++ b/app/views/admin/domains/partials/_nameservers.haml @@ -1,14 +1,14 @@ - panel_class = @domain.errors.messages[:nameservers] ? 'panel-danger' : 'panel-default' #nameservers.panel{class: panel_class} .panel-heading.clearfix - = t('nameservers') + = t(:nameservers) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('hostname') - %th{class: 'col-xs-4'}= t('ipv4') - %th{class: 'col-xs-4'}= t('ipv6') + %th{class: 'col-xs-4'}= t(:hostname) + %th{class: 'col-xs-4'}= t(:ipv4) + %th{class: 'col-xs-4'}= t(:ipv6) %tbody - @domain.nameservers.each do |x| %tr diff --git a/app/views/admin/domains/partials/_statuses.haml b/app/views/admin/domains/partials/_statuses.haml index f570921be..f6f6a115c 100644 --- a/app/views/admin/domains/partials/_statuses.haml +++ b/app/views/admin/domains/partials/_statuses.haml @@ -1,13 +1,13 @@ - panel_class = @domain.errors.messages[:domain_statuses] ? 'panel-danger' : 'panel-default' #domain_statuses.panel{class: panel_class} .panel-heading.clearfix - = t('statuses') + = t(:statuses) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-6'}= t('status') - %th{class: 'col-xs-6'}= t('description') + %th{class: 'col-xs-6'}= t(:status) + %th{class: 'col-xs-6'}= t(:description) %tbody - @domain.domain_statuses.each do |x| %tr diff --git a/app/views/admin/domains/partials/_tech_contacts.haml b/app/views/admin/domains/partials/_tech_contacts.haml index ea7eff13d..06c9ef95f 100644 --- a/app/views/admin/domains/partials/_tech_contacts.haml +++ b/app/views/admin/domains/partials/_tech_contacts.haml @@ -1,14 +1,14 @@ - panel_class = @domain.errors.messages[:tech_contacts] ? 'panel-danger' : 'panel-default' #tech_contacts.panel{class: panel_class} .panel-heading.clearfix - = t('tech_contacts') + = t(:tech_contacts) .table-responsive %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('name') - %th{class: 'col-xs-4'}= t('code') - %th{class: 'col-xs-4'}= t('email') + %th{class: 'col-xs-4'}= t(:name) + %th{class: 'col-xs-4'}= t(:code) + %th{class: 'col-xs-4'}= t(:email) %tbody - @domain.tech_contacts.each do |tc| %tr diff --git a/app/views/admin/invoices/index.haml b/app/views/admin/invoices/index.haml index 207f74c1d..45efe74de 100644 --- a/app/views/admin/invoices/index.haml +++ b/app/views/admin/invoices/index.haml @@ -1,6 +1,6 @@ .row .col-sm-12 - %h2.text-center-xs= t('invoices') + %h2.text-center-xs= t(:invoices) %hr .row .col-md-12 @@ -22,16 +22,16 @@ %td= link_to(x, [:admin, x]) %td= link_to(x.buyer_name, admin_registrar_path(x.buyer_id)) - if x.cancelled? - %td.text-grey= t('cancelled') + %td.text-grey= t(:cancelled) - else %td= l(x.due_date) - if x.binded? %td= l(x.receipt_date) - elsif x.cancelled? - %td.text-grey= t('cancelled') + %td.text-grey= t(:cancelled) - else - %td.text-danger= t('unpaid') + %td.text-danger= t(:unpaid) .row .col-md-12 = paginate @invoices diff --git a/app/views/admin/invoices/show.haml b/app/views/admin/invoices/show.haml index ccae84913..9bab21f1d 100644 --- a/app/views/admin/invoices/show.haml +++ b/app/views/admin/invoices/show.haml @@ -6,7 +6,7 @@ %h1.text-right.text-center-xs - if !@invoice.cancelled? && !@invoice.binded? = link_to(t(:cancel), cancel_admin_invoice_path(@invoice), method: :patch, class: 'btn btn-default') - = link_to(t('back'), admin_invoices_path, class: 'btn btn-default') + = link_to(t(:back), admin_invoices_path, class: 'btn btn-default') %hr = render 'shared/full_errors', object: @invoice diff --git a/app/views/admin/registrars/_form.haml b/app/views/admin/registrars/_form.haml index b54eb01e5..cd36c08eb 100644 --- a/app/views/admin/registrars/_form.haml +++ b/app/views/admin/registrars/_form.haml @@ -73,4 +73,4 @@ %hr .row .col-md-8.text-right - = button_tag(t('save'), class: 'btn btn-primary') + = button_tag(t(:save), class: 'btn btn-primary') diff --git a/app/views/admin/registrars/show.haml b/app/views/admin/registrars/show.haml index 17699cd90..f472b7625 100644 --- a/app/views/admin/registrars/show.haml +++ b/app/views/admin/registrars/show.haml @@ -60,7 +60,7 @@ .pull-left = t(:api_users) .pull-right - = link_to(t('create_new_api_user'), new_admin_registrar_api_user_path(@registrar), class: 'btn btn-primary btn-xs') + = link_to(t(:create_new_api_user), new_admin_registrar_api_user_path(@registrar), class: 'btn btn-primary btn-xs') .table-responsive %table.table.table-hover.table-bordered.table-condensed diff --git a/app/views/invoice_mailer/invoice_email.html.erb b/app/views/invoice_mailer/invoice_email.html.erb index 02be04880..0a9e4163b 100644 --- a/app/views/invoice_mailer/invoice_email.html.erb +++ b/app/views/invoice_mailer/invoice_email.html.erb @@ -1,5 +1,5 @@ -<%= t('you_have_a_new_invoice') %> +<%= t(:you_have_a_new_invoice) %>

-<%= t('sincerely') %>,
+<%= t(:sincerely) %>,
<%= Setting.eis_invoice_contact %>
<%= @invoice.seller_phone %> diff --git a/app/views/registrar/contacts/form_partials/_disclose.haml b/app/views/registrar/contacts/form_partials/_disclose.haml index e7c7ee959..51f675c57 100644 --- a/app/views/registrar/contacts/form_partials/_disclose.haml +++ b/app/views/registrar/contacts/form_partials/_disclose.haml @@ -1,41 +1,41 @@ .panel.panel-default .panel-heading.clearfix - .pull-left= t('contact_disclosure') + .pull-left= t(:contact_disclosure) .panel-body .form-group - = label_tag :contact_disclose_flag, t('flag_type'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_flag, t(:flag_type), class: 'col-md-2 control-label' .col-md-10 =# check_box_tag('contact[disclose][sv_policy]', @contact_params[:disclose][:sv_policy], class: 'form-control') = select_tag('contact[disclose][flag]', options_for_select(Depp::Contact::DISCLOSURE_TYPES) ) .panel-body .form-group - = label_tag :contact_disclose_name, t('name'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_name, t(:name), class: 'col-md-2 control-label' .col-md-10 = check_box_tag('contact[disclose][name]') .form-group - = label_tag :contact_disclose_email, t('email'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_email, t(:email), class: 'col-md-2 control-label' .col-md-10 = check_box_tag('contact[disclose][email]') .form-group - = label_tag :contact_disclose_org_name, t('org_name'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_org_name, t(:org_name), class: 'col-md-2 control-label' .col-md-10 = check_box_tag('contact[disclose][org_name]') .form-group - = label_tag :contact_disclose_address, t('address'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_address, t(:address), class: 'col-md-2 control-label' .col-md-10 = check_box_tag('contact[disclose][address]') .form-group - = label_tag :contact_disclose_voice, t('voice'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_voice, t(:voice), class: 'col-md-2 control-label' .col-md-10 = check_box_tag('contact[disclose][voice]') .form-group - = label_tag :contact_disclose_fax, t('fax'), class: 'col-md-2 control-label' + = label_tag :contact_disclose_fax, t(:fax), class: 'col-md-2 control-label' .col-md-10 = check_box_tag('contact[disclose][fax]') diff --git a/app/views/registrar/contacts/info_index.haml b/app/views/registrar/contacts/info_index.haml index c4fd16f68..8bec10ee0 100644 --- a/app/views/registrar/contacts/info_index.haml +++ b/app/views/registrar/contacts/info_index.haml @@ -4,11 +4,11 @@ .col-md-12 = form_tag registrar_contact_path, class: 'form-horizontal', method: :get do .form-group - = label_tag :contact_id, t('contact_id'), class: 'col-md-2 control-label' + = label_tag :contact_id, t(:contact_id), class: 'col-md-2 control-label' .col-md-10 = text_field_tag :contact_id, params[:contact_id], class: 'form-control', autocomplete: 'off' .form-group - = label_tag :password, t('password'), class: 'col-md-2 control-label' + = label_tag :password, t(:password), class: 'col-md-2 control-label' .col-md-10 = text_field_tag :password, params[:password], class: 'form-control', autocomplete: 'off' .form-group diff --git a/app/views/registrar/domains/_check_form.haml b/app/views/registrar/domains/_check_form.haml index 90242a7c0..2468fa69a 100644 --- a/app/views/registrar/domains/_check_form.haml +++ b/app/views/registrar/domains/_check_form.haml @@ -1,7 +1,7 @@ = form_tag check_registrar_domains_path, class: 'form-horizontal', method: :get do .col-md-11 .form-group - = text_field_tag :domain_name, params[:domain_name], class: 'form-control', placeholder: t('domain_name'), autocomplete: 'off' + = text_field_tag :domain_name, params[:domain_name], class: 'form-control', placeholder: t(:domain_name), autocomplete: 'off' .col-md-1.text-right.text-center-xs .form-group %button.btn.btn-primary diff --git a/app/views/registrar/domains/_form.haml b/app/views/registrar/domains/_form.haml index 385a2f507..aebe4ce65 100644 --- a/app/views/registrar/domains/_form.haml +++ b/app/views/registrar/domains/_form.haml @@ -15,7 +15,7 @@ .form-group .col-md-3.control-label - c, fr = 'required', true if params[:domain_name].blank? - = label_tag 'domain[legal_document]', t('legal_document'), class: c + = label_tag 'domain[legal_document]', t(:legal_document), class: c .col-md-7 = file_field_tag 'domain[legal_document]', required: fr .col-md-4 diff --git a/app/views/registrar/domains/check.haml b/app/views/registrar/domains/check.haml index 4808e9c5c..f8ebfeaca 100644 --- a/app/views/registrar/domains/check.haml +++ b/app/views/registrar/domains/check.haml @@ -10,16 +10,16 @@ .col-md-12 .panel.panel-default .panel-heading - %h3.panel-title= t('result') + %h3.panel-title= t(:result) .panel-body %dl.dl-horizontal - %dt= t('name') + %dt= t(:name) %dd= @data.css('name').text - name = @data.css('name').first - %dt= t('available') + %dt= t(:available) %dd= name['avail'] - if @data.css('reason').text.present? - %dt= t('reason') + %dt= t(:reason) %dd= @data.css('reason').text diff --git a/app/views/registrar/domains/delete.haml b/app/views/registrar/domains/delete.haml index ab83cd813..cbadbecd9 100644 --- a/app/views/registrar/domains/delete.haml +++ b/app/views/registrar/domains/delete.haml @@ -8,11 +8,11 @@ .panel-body .form-group .col-md-4.control-label - = label_tag 'domain[legal_document]', t('legal_document'), class: 'required' + = label_tag 'domain[legal_document]', t(:legal_document), class: 'required' .col-md-6 = file_field_tag 'domain[legal_document]', required: true = hidden_field_tag 'domain[name]', params[:domain_name] %hr .row .col-md-8.text-right - = button_tag t('delete'), class: 'btn btn-danger' + = button_tag t(:delete), class: 'btn btn-danger' diff --git a/app/views/registrar/domains/index.haml b/app/views/registrar/domains/index.haml index 3a65ddcbe..4574a9ef6 100644 --- a/app/views/registrar/domains/index.haml +++ b/app/views/registrar/domains/index.haml @@ -10,7 +10,7 @@ = form_tag info_registrar_domains_path, class: 'form-horizontal', method: :get do .col-md-11 .form-group - = text_field_tag :domain_name, params[:domain_name], class: 'form-control', placeholder: t('domain_name'), autocomplete: 'off', autofocus: true + = text_field_tag :domain_name, params[:domain_name], class: 'form-control', placeholder: t(:domain_name), autocomplete: 'off', autofocus: true .col-md-1.text-right.text-center-xs .form-group %button.btn.btn-default diff --git a/app/views/registrar/domains/partials/_contacts.haml b/app/views/registrar/domains/partials/_contacts.haml index ddb6d41e4..6c5bdeb86 100644 --- a/app/views/registrar/domains/partials/_contacts.haml +++ b/app/views/registrar/domains/partials/_contacts.haml @@ -5,8 +5,8 @@ %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('type') - %th{class: 'col-xs-8'}= t('code') + %th{class: 'col-xs-4'}= t(:type) + %th{class: 'col-xs-8'}= t(:code) %tbody - @data.css('contact').each do |x| %tr diff --git a/app/views/registrar/domains/partials/_dnskeys.haml b/app/views/registrar/domains/partials/_dnskeys.haml index 9bbca3e95..fc5961849 100644 --- a/app/views/registrar/domains/partials/_dnskeys.haml +++ b/app/views/registrar/domains/partials/_dnskeys.haml @@ -1,33 +1,33 @@ .panel.panel-default .panel-heading - %h3.panel-title= t('dnskeys') + %h3.panel-title= t(:dnskeys) .panel-body{style: 'word-wrap: break-word;'} - @data.css('dsData').each do |x| %dl.dl-horizontal - if x.css('keyTag').text.present? - %dt= t('ds_key_tag') + %dt= t(:ds_key_tag) %dd= x.css('keyTag').text - if x.css('alg').first.text.present? - %dt= t('ds_algorithm') + %dt= t(:ds_algorithm) %dd= x.css('alg').first.text - if x.css('digestType').text.present? - %dt= t('ds_digest_type') + %dt= t(:ds_digest_type) %dd= x.css('digestType').text - if x.css('digest').text.present? - %dt= t('ds_digest') + %dt= t(:ds_digest) %dd= x.css('digest').text - %dt= t('flag') + %dt= t(:flag) %dd= x.css('flags').text - %dt= t('protocol') + %dt= t(:protocol) %dd= x.css('protocol').text - %dt= t('algorithm') + %dt= t(:algorithm) %dd= x.css('keyData > alg').text - %dt= t('public_key') + %dt= t(:public_key) %dd= x.css('pubKey').text diff --git a/app/views/registrar/domains/partials/_nameservers.haml b/app/views/registrar/domains/partials/_nameservers.haml index 851801229..2ab72d95a 100644 --- a/app/views/registrar/domains/partials/_nameservers.haml +++ b/app/views/registrar/domains/partials/_nameservers.haml @@ -5,9 +5,9 @@ %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('hostname') - %th{class: 'col-xs-4'}= t('ipv4') - %th{class: 'col-xs-4'}= t('ipv6') + %th{class: 'col-xs-4'}= t(:hostname) + %th{class: 'col-xs-4'}= t(:ipv4) + %th{class: 'col-xs-4'}= t(:ipv6) %tbody - @data.css('hostAttr').each do |x| %tr diff --git a/app/views/registrar/domains/partials/_statuses.haml b/app/views/registrar/domains/partials/_statuses.haml index 5cd71caec..57ecc4105 100644 --- a/app/views/registrar/domains/partials/_statuses.haml +++ b/app/views/registrar/domains/partials/_statuses.haml @@ -5,8 +5,8 @@ %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-6'}= t('status') - %th{class: 'col-xs-6'}= t('description') + %th{class: 'col-xs-6'}= t(:status) + %th{class: 'col-xs-6'}= t(:description) %tbody - @data.css('status').each do |x| %tr diff --git a/app/views/registrar/domains/renew_index.haml b/app/views/registrar/domains/renew_index.haml index 51dee074a..92f7a8108 100644 --- a/app/views/registrar/domains/renew_index.haml +++ b/app/views/registrar/domains/renew_index.haml @@ -8,7 +8,7 @@ = label_tag :domain_name, t(:name), class: 'required' .col-md-7 = text_field_tag :domain_name, params[:domain_name], - class: 'form-control', placeholder: t('domain_name'), autocomplete: 'off', required: true + class: 'form-control', placeholder: t(:domain_name), autocomplete: 'off', required: true .form-group .col-md-3.control-label diff --git a/app/views/registrar/domains/transfer.haml b/app/views/registrar/domains/transfer.haml index 1bb7caee9..b5a8f438f 100644 --- a/app/views/registrar/domains/transfer.haml +++ b/app/views/registrar/domains/transfer.haml @@ -4,10 +4,10 @@ .col-md-12 .panel.panel-default .panel-heading - %h3.panel-title= t('result') + %h3.panel-title= t(:result) .panel-body %dl.dl-horizontal - %dt= t('domain_name') + %dt= t(:domain_name) %dd= @data.css('name').text - @data.css('trnData').children.each do |x| diff --git a/app/views/registrar/invoices/index.haml b/app/views/registrar/invoices/index.haml index 18f027fb0..d0c38940b 100644 --- a/app/views/registrar/invoices/index.haml +++ b/app/views/registrar/invoices/index.haml @@ -63,7 +63,7 @@ - if x.receipt_date %td= l(x.receipt_date) - elsif x.cancelled? - %td.text-grey= t('cancelled') + %td.text-grey= t(:cancelled) - else %td{class: 'text-danger'}= t(:unpaid) diff --git a/app/views/registrar/invoices/partials/_banklinks.haml b/app/views/registrar/invoices/partials/_banklinks.haml index 883adb418..efd6f8564 100644 --- a/app/views/registrar/invoices/partials/_banklinks.haml +++ b/app/views/registrar/invoices/partials/_banklinks.haml @@ -1,4 +1,4 @@ -%h4= t('pay_by_bank_link') +%h4= t(:pay_by_bank_link) %hr = link_to '#' do = image_tag('swed.png') diff --git a/app/views/registrar/invoices/partials/_buyer.haml b/app/views/registrar/invoices/partials/_buyer.haml index 2993cd823..30824ff01 100644 --- a/app/views/registrar/invoices/partials/_buyer.haml +++ b/app/views/registrar/invoices/partials/_buyer.haml @@ -1,23 +1,23 @@ -%h4= t('buyer') +%h4= t(:buyer) %hr %dl.dl-horizontal - %dt= t('name') + %dt= t(:name) %dd= @invoice.buyer_name - %dt= t('reg_no') + %dt= t(:reg_no) %dd= @invoice.buyer_reg_no - %dt= t('address') + %dt= t(:address) %dd= @invoice.buyer_address - %dt= t('country') + %dt= t(:country) %dd= @invoice.buyer_country - %dt= t('phone') + %dt= t(:phone) %dd= @invoice.buyer_phone - %dt= t('url') + %dt= t(:url) %dd= @invoice.buyer_url - %dt= t('email') + %dt= t(:email) %dd= @invoice.buyer_email diff --git a/app/views/registrar/invoices/partials/_details.haml b/app/views/registrar/invoices/partials/_details.haml index 0e5528514..07a2d0761 100644 --- a/app/views/registrar/invoices/partials/_details.haml +++ b/app/views/registrar/invoices/partials/_details.haml @@ -1,33 +1,33 @@ -%h4= t('details') +%h4= t(:details) %hr %dl.dl-horizontal - %dt= t('issue_date') + %dt= t(:issue_date) %dd= l(@invoice.created_at) - if @invoice.cancelled? - %dt= t('cancel_date') + %dt= t(:cancel_date) %dd= l(@invoice.cancelled_at) - %dt= t('due_date') + %dt= t(:due_date) - if @invoice.cancelled? - %dd.text-grey= t('cancelled') + %dd.text-grey= t(:cancelled) - else %dd= l(@invoice.due_date) - %dt= t('receipt_date') + %dt= t(:receipt_date) - if @invoice.binded? %dd= l(@invoice.receipt_date) - elsif @invoice.cancelled? - %dd.text-grey= t('cancelled') + %dd.text-grey= t(:cancelled) - else - %dd{class: 'text-danger'}= t('unpaid') + %dd{class: 'text-danger'}= t(:unpaid) - %dt= t('payment_term') + %dt= t(:payment_term) %dd= t(@invoice.payment_term) - %dt= t('description') + %dt= t(:description) - @invoice.description.prepend(' - ') if @invoice.description.present? %dd= "#{t('invoice_no', no: @invoice.id)}#{@invoice.description}" - %dt= t('reference_no') + %dt= t(:reference_no) %dd= @invoice.reference_no diff --git a/app/views/registrar/invoices/partials/_items.haml b/app/views/registrar/invoices/partials/_items.haml index 4babfaddd..784fe4412 100644 --- a/app/views/registrar/invoices/partials/_items.haml +++ b/app/views/registrar/invoices/partials/_items.haml @@ -1,14 +1,14 @@ -%h4= t('items') +%h4= t(:items) %hr .table-responsive %table.table.table-hover.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('description') - %th{class: 'col-xs-2'}= t('unit') - %th{class: 'col-xs-2'}= t('amount') - %th{class: 'col-xs-2'}= t('price') - %th{class: 'col-xs-2'}= t('total') + %th{class: 'col-xs-4'}= t(:description) + %th{class: 'col-xs-2'}= t(:unit) + %th{class: 'col-xs-2'}= t(:amount) + %th{class: 'col-xs-2'}= t(:price) + %th{class: 'col-xs-2'}= t(:total) %tbody - @invoice.items.each do |x| %tr @@ -20,7 +20,7 @@ %tfoot %tr %th{colspan: 3} - %th= t('total_without_vat') + %th= t(:total_without_vat) %td= @invoice.sum_without_vat %tr %th.no-border{colspan: 3} @@ -28,5 +28,5 @@ %td= @invoice.vat %tr %th.no-border{colspan: 3} - %th= t('total') + %th= t(:total) %td= @invoice.sum diff --git a/app/views/registrar/invoices/partials/_seller.haml b/app/views/registrar/invoices/partials/_seller.haml index ab082fcd0..0008c2f13 100644 --- a/app/views/registrar/invoices/partials/_seller.haml +++ b/app/views/registrar/invoices/partials/_seller.haml @@ -1,38 +1,38 @@ -%h4= t('seller') +%h4= t(:seller) %hr %dl.dl-horizontal - %dt= t('name') + %dt= t(:name) %dd= @invoice.seller_name - %dt= t('reg_no') + %dt= t(:reg_no) %dd= @invoice.seller_reg_no - %dt= t('iban') + %dt= t(:iban) %dd= @invoice.seller_iban - %dt= t('bank') + %dt= t(:bank) %dd= @invoice.seller_bank - %dt= t('swift') + %dt= t(:swift) %dd= @invoice.seller_swift - %dt= t('vat_no') + %dt= t(:vat_no) %dd= @invoice.seller_vat_no - %dt= t('address') + %dt= t(:address) %dd= @invoice.seller_address - %dt= t('country') + %dt= t(:country) %dd= @invoice.seller_country - %dt= t('phone') + %dt= t(:phone) %dd= @invoice.seller_phone - %dt= t('url') + %dt= t(:url) %dd= @invoice.seller_url - %dt= t('email') + %dt= t(:email) %dd= @invoice.seller_email - %dt= t('issuer') + %dt= t(:issuer) %dd= @invoice.seller_contact_name diff --git a/app/views/registrar/invoices/partials/_total.haml b/app/views/registrar/invoices/partials/_total.haml index 247f84b64..5ed1db4f2 100644 --- a/app/views/registrar/invoices/partials/_total.haml +++ b/app/views/registrar/invoices/partials/_total.haml @@ -1,17 +1,17 @@ -%h4= t('total') +%h4= t(:total) %hr %dl.dl-horizontal - / %dt= t('document_name') + / %dt= t(:document_name) / %dd= t(@invoice.document_name) - %dt= t('issue_date') + %dt= t(:issue_date) %dd= l(@invoice.created_at) - %dt= t('due_date') + %dt= t(:due_date) %dd= l(@invoice.due_date) - %dt= t('payment_term') + %dt= t(:payment_term) %dd= t(@invoice.payment_term) - %dt= t('description') + %dt= t(:description) %dd= @invoice.description diff --git a/app/views/registrar/invoices/pdf.haml b/app/views/registrar/invoices/pdf.haml index 95cb3c1a0..f4644d80e 100644 --- a/app/views/registrar/invoices/pdf.haml +++ b/app/views/registrar/invoices/pdf.haml @@ -148,68 +148,68 @@ Details %hr %dl.dl-horizontal - %dt= t('issue_date') + %dt= t(:issue_date) %dd= l(@invoice.created_at) - if @invoice.cancelled? - %dt= t('cancel_date') + %dt= t(:cancel_date) %dd= l(@invoice.cancelled_at) - %dt= t('due_date') + %dt= t(:due_date) - if @invoice.cancelled? - %dd= t('cancelled') + %dd= t(:cancelled) - else %dd= l(@invoice.due_date) - %dt= t('receipt_date') + %dt= t(:receipt_date) - if @invoice.binded? %dd= l(@invoice.receipt_date) - elsif @invoice.cancelled? - %dd= t('cancelled') + %dd= t(:cancelled) - else - %dd{class: 'text-danger'}= t('unpaid') + %dd{class: 'text-danger'}= t(:unpaid) - %dt= t('issuer') + %dt= t(:issuer) %dd= @invoice.seller_contact_name - %dt= t('payment_term') + %dt= t(:payment_term) %dd= t(@invoice.payment_term) - %dt= t('description') + %dt= t(:description) - @invoice.description.prepend(' - ') if @invoice.description.present? %dd= "#{t('invoice_no', no: @invoice.id)}#{@invoice.description}" - %dt= t('reference_no') + %dt= t(:reference_no) %dd= @invoice.reference_no .col-md-6.right - %h4= t('client') + %h4= t(:client) %hr %dl.dl-horizontal - %dt= t('name') + %dt= t(:name) %dd= @invoice.buyer_name - %dt= t('reg_no') + %dt= t(:reg_no) %dd= @invoice.buyer_reg_no - if @invoice.buyer_address.present? - %dt= t('address') + %dt= t(:address) %dd= @invoice.buyer_address - if @invoice.buyer_country.present? - %dt= t('country') + %dt= t(:country) %dd= @invoice.buyer_country - if @invoice.buyer_phone.present? - %dt= t('phone') + %dt= t(:phone) %dd= @invoice.buyer_phone - if @invoice.buyer_phone.present? - %dt= t('url') + %dt= t(:url) %dd= @invoice.buyer_url - if @invoice.buyer_email.present? - %dt= t('email') + %dt= t(:email) %dd= @invoice.buyer_email .clear @@ -219,11 +219,11 @@ %table.table.table-hover.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t('description') - %th{class: 'col-xs-2'}= t('unit') - %th{class: 'col-xs-1'}= t('amount') - %th{class: 'col-xs-3'}= t('price') - %th{class: 'col-xs-2'}= t('total') + %th{class: 'col-xs-4'}= t(:description) + %th{class: 'col-xs-2'}= t(:unit) + %th{class: 'col-xs-1'}= t(:amount) + %th{class: 'col-xs-3'}= t(:price) + %th{class: 'col-xs-2'}= t(:total) %tbody - @invoice.items.each do |x| %tr @@ -235,7 +235,7 @@ %tfoot %tr %th{colspan: 3} - %th= t('total_without_vat') + %th= t(:total_without_vat) %td= "#{@invoice.sum_without_vat} #{@invoice.currency}" %tr %th.no-border{colspan: 3} @@ -243,7 +243,7 @@ %td= "#{@invoice.vat} #{@invoice.currency}" %tr %th.no-border{colspan: 3} - %th= t('total') + %th= t(:total) %td= "#{@invoice.sum} #{@invoice.currency}" #footer @@ -268,11 +268,11 @@ = @invoice.seller_url .col-md-3.text-right.left - = t('bank') + = t(:bank) %br - = t('iban') + = t(:iban) %br - = t('swift') + = t(:swift) .col-md-3.left = @invoice.seller_bank diff --git a/app/views/registrar/nameservers/index.haml b/app/views/registrar/nameservers/index.haml index 493f17cd0..915b0d935 100644 --- a/app/views/registrar/nameservers/index.haml +++ b/app/views/registrar/nameservers/index.haml @@ -25,7 +25,7 @@ = t(:replace) .row .col-md-12 - %p.help-block= t('hostnames_will_be_replaced_only_if_domain_validates_with_the_new_nameserver') + %p.help-block= t(:hostnames_will_be_replaced_only_if_domain_validates_with_the_new_nameserver) %hr .row .col-md-12 diff --git a/app/views/registrar/polls/show.haml b/app/views/registrar/polls/show.haml index fcfa994a3..90a5bb02a 100644 --- a/app/views/registrar/polls/show.haml +++ b/app/views/registrar/polls/show.haml @@ -11,49 +11,49 @@ .pull-left= t('message_no', id: msg_q['id']) .pull-right - if @data.css('panData').any? # this is a keyrelay request - = link_to(t('confirm'), 'javascript: void(0);', class: 'btn btn-warning btn-xs js-keyrelay-confirm') + = link_to(t(:confirm), 'javascript: void(0);', class: 'btn btn-warning btn-xs js-keyrelay-confirm') - if @data.css('trnData trStatus').any? # this is a transfer request - unless ['serverApproved', 'clientApproved'].include?(@data.css('trStatus').first.text) - = link_to(t('confirm'), 'javascript: void(0);', class: 'btn btn-warning btn-xs js-transfer-confirm') - = link_to(t('dequeue'), registrar_poll_path(id: msg_q['id']), method: :delete, class: 'btn btn-primary btn-xs') + = link_to(t(:confirm), 'javascript: void(0);', class: 'btn btn-warning btn-xs js-transfer-confirm') + = link_to(t(:dequeue), registrar_poll_path(id: msg_q['id']), method: :delete, class: 'btn btn-primary btn-xs') .panel-body %dl.dl-horizontal - %dt= t('message') + %dt= t(:message) %dd= msg_q.css('msg').text - %dt= t('queue_date') + %dt= t(:queue_date) %dd= @data.css('qDate').text %dl.dl-horizontal / keyrelay - if @data.css('panData').any? - %dt= t('domain_name') + %dt= t(:domain_name) %dd= @data.css('name').text - %dt= t('password') + %dt= t(:password) %dd= @data.css('pw').text - if @data.css('relative').text.present? - %dt= t('expiry_relative') + %dt= t(:expiry_relative) %dd= @data.css('relative').text - if @data.css('absolute').text.present? - %dt= t('expiry_absolute') + %dt= t(:expiry_absolute) %dd= @data.css('absolute').text %dt paDate %dd= @data.css('paDate').text - %dt= t('flag') + %dt= t(:flag) %dd= @data.css('flags').text - %dt= t('protocol') + %dt= t(:protocol) %dd= @data.css('protocol').text - %dt= t('algorithm') + %dt= t(:algorithm) %dd= @data.css('alg').text - %dt= t('public_key') + %dt= t(:public_key) %dd= @data.css('pubKey').text = form_tag confirm_keyrelay_registrar_poll_path, class: 'js-keyrelay-form' do @@ -79,7 +79,7 @@ %hr .row .col-md-12 - %p.bg-info{style: 'padding: 15px;'}= t('you_have_no_new_messages') + %p.bg-info{style: 'padding: 15px;'}= t(:you_have_no_new_messages) :coffee $(".js-keyrelay-confirm").on "click", ->