From ebcb8ff3e76dc1584a9731db43470c3301f66d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Turbelin?= Date: Sun, 19 Feb 2017 13:47:23 +0100 Subject: [PATCH] Finishing Translations keys implemtentation on Admin ERB views --- ...business_model_configuration_controller.rb | 3 +- .../index/add_distributor_th.html.haml.deface | 2 +- .../index/add_distributor_th.html.haml.deface | 2 +- .../add_accounts_and_billing.html.haml.deface | 2 +- ...iness_model_configuration.html.haml.deface | 2 +- .../add_caching.html.haml.deface | 2 +- .../add_content.html.haml.deface | 2 +- .../add_temp_controlled_th.html.haml.deface | 2 +- .../index/add_distributor_th.html.haml.deface | 2 +- .../_method_settings.html.haml | 4 +- .../edit.html.haml | 47 +++++++------- .../edit.html.haml | 53 +++++++-------- config/locales/en-GB.yml | 62 +++++++++++++----- config/locales/en-US.yml | 63 +++++++++++++----- config/locales/en.yml | 65 ++++++++++++++----- config/locales/fr.yml | 62 +++++++++++++----- config/locales/it.yml | 62 +++++++++++++----- config/locales/nb.yml | 62 +++++++++++++----- config/locales/pt-BR.yml | 62 +++++++++++++----- config/locales/sv.yml | 62 +++++++++++++----- .../business_model_configuration_spec.rb | 2 +- 21 files changed, 426 insertions(+), 199 deletions(-) diff --git a/app/controllers/admin/business_model_configuration_controller.rb b/app/controllers/admin/business_model_configuration_controller.rb index b3c3c67ab8..1cf2ad088d 100644 --- a/app/controllers/admin/business_model_configuration_controller.rb +++ b/app/controllers/admin/business_model_configuration_controller.rb @@ -6,7 +6,8 @@ class Admin::BusinessModelConfigurationController < Spree::Admin::BaseController def update Spree::Config.set(params[:settings]) - flash[:success] = t(:successfully_updated, :resource => t(:business_model_configuration)) + flash[:success] = t(:successfully_updated, + resource: t('admin.business_model_configuration.edit.business_model_configuration')) redirect_to_edit end diff --git a/app/overrides/spree/admin/orders/index/add_distributor_th.html.haml.deface b/app/overrides/spree/admin/orders/index/add_distributor_th.html.haml.deface index d5be7e956c..bba71ef434 100644 --- a/app/overrides/spree/admin/orders/index/add_distributor_th.html.haml.deface +++ b/app/overrides/spree/admin/orders/index/add_distributor_th.html.haml.deface @@ -1,4 +1,4 @@ / insert_top "[data-hook='admin_orders_index_headers']" %th - Distributor + = t(:products_distributor) diff --git a/app/overrides/spree/admin/payment_methods/index/add_distributor_th.html.haml.deface b/app/overrides/spree/admin/payment_methods/index/add_distributor_th.html.haml.deface index b14ca58392..6a46fe448c 100644 --- a/app/overrides/spree/admin/payment_methods/index/add_distributor_th.html.haml.deface +++ b/app/overrides/spree/admin/payment_methods/index/add_distributor_th.html.haml.deface @@ -1,4 +1,4 @@ / insert_after "[data-hook='admin_payment_methods_index_headers'] th:first-child" %th - Distributors + = t(:products_distributor) diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface index 37754bb40e..eb6ab7c01b 100644 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface +++ b/app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface @@ -1,4 +1,4 @@ // insert_bottom "[data-hook='admin_configurations_sidebar_menu']" %li - = link_to t(:accounts_and_billing), main_app.edit_admin_accounts_and_billing_settings_path + = link_to t('admin.accounts_and_billing_settings.edit.accounts_and_billing'), main_app.edit_admin_accounts_and_billing_settings_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface index 7d5c311a7b..32d0edfda1 100644 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface +++ b/app/overrides/spree/admin/shared/_configuration_menu/add_business_model_configuration.html.haml.deface @@ -1,4 +1,4 @@ // insert_bottom "[data-hook='admin_configurations_sidebar_menu']" %li - = link_to 'Business Model', main_app.edit_admin_business_model_configuration_path + = link_to t('admin.business_model_configuration.edit.business_model_configuration'), main_app.edit_admin_business_model_configuration_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface index 1eb416e72a..c320e072c0 100644 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface +++ b/app/overrides/spree/admin/shared/_configuration_menu/add_caching.html.haml.deface @@ -1,4 +1,4 @@ / insert_bottom "[data-hook='admin_configurations_sidebar_menu']" %li - = link_to 'Caching', main_app.admin_cache_settings_path + = link_to t('admin.cache_settings.show.title'), main_app.admin_cache_settings_path diff --git a/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface b/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface index 0709cb9451..58ba1fc824 100644 --- a/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface +++ b/app/overrides/spree/admin/shared/_configuration_menu/add_content.html.haml.deface @@ -1,3 +1,3 @@ / insert_bottom "[data-hook='admin_configurations_sidebar_menu']" -%li= link_to 'Content', main_app.edit_admin_content_path +%li= link_to t('admin.contents.edit.title'), main_app.edit_admin_content_path diff --git a/app/overrides/spree/admin/shipping_categories/index/add_temp_controlled_th.html.haml.deface b/app/overrides/spree/admin/shipping_categories/index/add_temp_controlled_th.html.haml.deface index 561e59bf91..0b41db13d5 100644 --- a/app/overrides/spree/admin/shipping_categories/index/add_temp_controlled_th.html.haml.deface +++ b/app/overrides/spree/admin/shipping_categories/index/add_temp_controlled_th.html.haml.deface @@ -1,4 +1,4 @@ / insert_after "[data-hook='categories_header'] th:first-child" %th - Temperature Controlled + = t(:temperature_controlled) diff --git a/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface b/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface index 620f02f965..618d758898 100644 --- a/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface +++ b/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface @@ -1,4 +1,4 @@ / insert_after "[data-hook='admin_shipping_methods_index_headers'] th:first-child" %th - Distributors + = t(:products_distributor) diff --git a/app/views/admin/accounts_and_billing_settings/_method_settings.html.haml b/app/views/admin/accounts_and_billing_settings/_method_settings.html.haml index 17037d47e9..32b1c0b9a5 100644 --- a/app/views/admin/accounts_and_billing_settings/_method_settings.html.haml +++ b/app/views/admin/accounts_and_billing_settings/_method_settings.html.haml @@ -1,10 +1,10 @@ .row .six.columns.alpha .field - = label :settings, :default_accounts_payment_method_id, t(:default_accounts_payment_method) + = label :settings, :default_accounts_payment_method_id, t('.default_accounts_payment_method') = collection_select(:settings, :default_accounts_payment_method_id, @payment_methods, :id, :name, { include_blank: true, selected: Spree::Config.default_accounts_payment_method_id}, { class: "select2 fullwidth" }) .six.columns.omega .field - = label :settings, :default_accounts_shipping_method_id, t(:default_accounts_shipping_method) + = label :settings, :default_accounts_shipping_method_id, t('.default_accounts_shipping_method') = collection_select(:settings, :default_accounts_shipping_method_id, @shipping_methods, :id, :name, { include_blank: true, selected: Spree::Config.default_accounts_shipping_method_id}, { class: "select2 fullwidth" }) diff --git a/app/views/admin/accounts_and_billing_settings/edit.html.haml b/app/views/admin/accounts_and_billing_settings/edit.html.haml index 83cfbbb76e..e17ceec637 100644 --- a/app/views/admin/accounts_and_billing_settings/edit.html.haml +++ b/app/views/admin/accounts_and_billing_settings/edit.html.haml @@ -1,7 +1,7 @@ = render :partial => 'spree/admin/shared/configuration_menu' - content_for :page_title do - = t(:accounts_and_billing) + = t('.accounts_and_billing') = render 'spree/shared/error_messages', target: @settings @@ -9,12 +9,12 @@ %fieldset.no-border-bottom %legend - = t(:admin_settings) + = t('.admin_settings') = form_for @settings, as: :settings, url: main_app.admin_accounts_and_billing_settings_path, :method => :put do |f| .row{ ng: { app: 'admin.accounts_and_billing_settings' } } .twelve.columns.alpha.omega .field - = f.label :accounts_distributor_id, t(:accounts_administration_distributor) + = f.label :accounts_distributor_id, t('.accounts_administration_distributor') = f.collection_select(:accounts_distributor_id, @distributors, :id, :name, { include_blank: true }, { class: "select2 fullwidth", 'watch-value-as' => "enterprise_id"}) = f.hidden_field :default_accounts_payment_method_id, value: '' @@ -25,18 +25,16 @@ .six.columns.alpha %fieldset.no-border-bottom %legend - =t :update_invoice + = t('.update_invoice') = f.check_box :auto_update_invoices - = f.label :auto_update_invoices, - t(:auto_update_invoices) + = f.label :auto_update_invoices, t('.auto_update_invoices') .six.columns.omega %fieldset.no-border-bottom %legend - =t :finalise_invoice + = t('.finalise_invoice') = f.check_box :auto_finalize_invoices - = f.label :auto_finalize_invoices, - t(:auto_finalise_invoices) + = f.label :auto_finalize_invoices, t('.auto_finalise_invoices') .row .twelve.columns.alpha.omega.form-buttons{"data-hook" => "buttons"} @@ -44,36 +42,35 @@ %fieldset.no-border-bottom %legend - =t :manually_run_task + =t('.manually_run_task') .row .six.columns.alpha.step.text-center .form-buttons{"data-hook" => "buttons"} - =link_to_with_icon "icon-undo", - t(:update_user_invoices) , - main_app.start_job_admin_accounts_and_billing_settings_path(job: { name: "update_account_invoices" }), - class: "button fullwidth" + = link_to_with_icon "icon-undo", t('.update_user_invoices'), + main_app.start_job_admin_accounts_and_billing_settings_path(job: { name: "update_account_invoices" }), + class: "button fullwidth" %br - if @update_account_invoices_job %p.text-center - if @update_account_invoices_job.run_at < Time.zone.now - =t :in_progress + = t(:in_progress) %br - =t :started_at + = t(:started_at) - else %strong - =t :queued + = t(:queued) %br - =t :Scheduled_for + = t(:scheduled_for) = @update_account_invoices_job.run_at - else %p.explanation - =t :update_user_invoice_explained + = t('.update_user_invoice_explained') .six.columns.omega.step.text-center .form-buttons{"data-hook" => "buttons"} - =link_to_with_icon "icon-ok-sign", t(:finalise_user_invoices ), + =link_to_with_icon "icon-ok-sign", t('.finalise_user_invoices'), main_app.start_job_admin_accounts_and_billing_settings_path(job: { name: "finalize_account_invoices" }), class: "button fullwidth" @@ -83,15 +80,15 @@ %p.text-center - if @finalize_account_invoices_job.run_at < Time.zone.now %strong - =t :in_progress + = t(:in_progress) %br - =t :started_at + = t(:started_at) - else %strong - =t :queued + = t(:queued) %br - =t :scheduled_for + = t(:scheduled_for) = @finalize_account_invoices_job.run_at - else %p.explanation - =t :finalise_user_invoice_explained + = t('.finalise_user_invoice_explained') diff --git a/app/views/admin/business_model_configuration/edit.html.haml b/app/views/admin/business_model_configuration/edit.html.haml index 04ee47e45d..29139d78bf 100644 --- a/app/views/admin/business_model_configuration/edit.html.haml +++ b/app/views/admin/business_model_configuration/edit.html.haml @@ -4,57 +4,58 @@ = "ng-app='admin.businessModelConfiguration'" - content_for :page_title do - %h1.page-title= t(:business_model_configuration) - %a{ 'ofn-with-tip' => "Configure the rate at which shops will be charged each month for use of the Open Food Network." } What's this? + %h1.page-title= t('.business_model_configuration') + %a{ 'ofn-with-tip' => t('.business_model_configuration_tip') } + = t('admin.whats_this') = render 'spree/shared/error_messages', target: @settings .row{ ng: { controller: "BusinessModelConfigCtrl" } } .five.columns.omega %fieldset.no-border-bottom - %legend=t(:bill_calculation_settings) + %legend=t('.bill_calculation_settings') %p - Adjust the amount that enterprises will be billed each month for use of the OFN. + = t('.bill_calculation_settings_tip') %br = form_for @settings, as: :settings, url: main_app.admin_business_model_configuration_path, :method => :put do |f| .row .three.columns.alpha - = f.label :shop_trial_length_days, t(:shop_trial_length) - %span.icon-question-sign{'ofn-with-tip' => "The length of time (in days) that enterprises who are set up as shops can run as a trial period."} + = f.label :shop_trial_length_days, t('.shop_trial_length') + %span.icon-question-sign{'ofn-with-tip' => t('.shop_trial_length_tip')} .two.columns.omega = f.number_field :shop_trial_length_days, min: 0.0, step: 1.0, class: "fullwidth" .row .three.columns.alpha - = f.label :account_invoices_monthly_fixed, t(:fixed_monthly_charge) - %span.icon-question-sign{'ofn-with-tip' => "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)."} + = f.label :account_invoices_monthly_fixed, t('.fixed_monthly_charge') + %span.icon-question-sign{'ofn-with-tip' => t('.fixed_monthly_charge_tip')} .two.columns.omega .input-symbol.before %span= Spree::Money.currency_symbol = f.number_field :account_invoices_monthly_fixed, min: 0.0, class: "fullwidth", 'watch-value-as' => 'fixed' .row .three.columns.alpha - = f.label :account_invoices_monthly_rate, t(:percentage_of_turnover) - %span.icon-question-sign{'ofn-with-tip' => "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill."} + = f.label :account_invoices_monthly_rate, t('.percentage_of_turnover') + %span.icon-question-sign{'ofn-with-tip' => t('.percentage_of_turnover_tip')} .two.columns.omega = f.number_field :account_invoices_monthly_rate, min: 0.0, max: 1.0, step: 0.01, class: "fullwidth", 'watch-value-as' => 'rate' .row .three.columns.alpha - = f.label :account_invoices_monthly_cap, t(:monthly_cap_excl_tax) - %span.icon-question-sign{'ofn-with-tip' => "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month."} + = f.label :account_invoices_monthly_cap, t('.monthly_cap_excl_tax') + %span.icon-question-sign{'ofn-with-tip' => t('.monthly_cap_excl_tax_tip')} .two.columns.omega .input-symbol.before %span= Spree::Money.currency_symbol = f.number_field :account_invoices_monthly_cap, min: 0.0, class: "fullwidth", 'watch-value-as' => 'cap' .row .three.columns.alpha - = f.label :account_invoices_tax_rate, t(:tax_rate) - %span.icon-question-sign{'ofn-with-tip' => "Tax rate that applies to the the monthly bill that enterprises are charged for using the system."} + = f.label :account_invoices_tax_rate, t('.tax_rate') + %span.icon-question-sign{'ofn-with-tip' => t('.tax_rate_tip')} .two.columns.omega = f.number_field :account_invoices_tax_rate, min: 0.0, max: 1.0, step: 0.01, class: "fullwidth", 'watch-value-as' => 'taxRate' .row .three.columns.alpha - = f.label :minimum_billable_turnover, t(:minimum_monthly_billable_turnover) - %span.icon-question-sign{'ofn-with-tip' => "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate."} + = f.label :minimum_billable_turnover, t('.minimum_monthly_billable_turnover') + %span.icon-question-sign{'ofn-with-tip' => t('.minimum_monthly_billable_turnover_tip')} .two.columns.omega .input-symbol.before %span= Spree::Money.currency_symbol @@ -69,35 +70,35 @@ .five.columns.alpha %fieldset.no-border-bottom - %legend=t(:example_bill_calculator) + %legend= t('.example_bill_calculator') %p - Alter the example turnover to visualise the effect of the settings to the left. + = t('.example_bill_calculator_legend') %br .row .three.columns.alpha - = label_tag :turnover, t(:example_monthly_turnover) - %span.icon-question-sign{'ofn-with-tip' => "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below."} + = label_tag :turnover, t('.example_monthly_turnover') + %span.icon-question-sign{'ofn-with-tip' => t('.example_monthly_turnover_tip')} .two.columns.omega .input-symbol.before %span= Spree::Money.currency_symbol %input.fullwidth{ id: 'turnover', type: "number", ng: { model: 'turnover' } } .row .three.columns.alpha - = label_tag :cap_reached, t(:cap_reached?) - %span.icon-question-sign{'ofn-with-tip' => "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided."} + = label_tag :cap_reached, t('.cap_reached?') + %span.icon-question-sign{'ofn-with-tip' => t('.cap_reached?_tip')} .two.columns.omega %input.fullwidth{ id: 'cap_reached', type: "text", readonly: true, ng: { value: 'capReached()' } } .row .three.columns.alpha - = label_tag :included_tax, t(:included_tax) - %span.icon-question-sign{'ofn-with-tip' => "The total tax included in the example monthly bill, given the settings and the turnover provided."} + = label_tag :included_tax, t('.included_tax') + %span.icon-question-sign{'ofn-with-tip' => t('.included_tax_tip')} .two.columns.omega %span= Spree::Money.currency_symbol %input.fullwidth{ id: 'included_tax', type: "text", readonly: true, ng: { value: 'includedTax()' } } .row .three.columns.alpha - = label_tag :total_incl_tax, t(:total_monthly_bill_incl_tax) - %span.icon-question-sign{'ofn-with-tip' => "The example total monthly bill with tax included, given the settings and the turnover provided."} + = label_tag :total_incl_tax, t('.total_monthly_bill_incl_tax') + %span.icon-question-sign{'ofn-with-tip' => t('.total_monthly_bill_incl_tax_tip')} .two.columns.omega %span= Spree::Money.currency_symbol %input.fullwidth{ id: 'total_incl_tax', type: "text", readonly: true, ng: { value: 'total()' } } diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 5542c29963..337e8e2e3a 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -39,16 +39,12 @@ en-GB: must_have_valid_business_number: "Please enter your company number." invoice: "Invoice" percentage_of_sales: "%{percentage} of sales" - percentage_of_turnover: "Percentage of turnover" - monthly_cap_excl_tax: "monthly cap (excl. VAT)" capped_at_cap: "capped at %{cap}" per_month: "per month" free: "pay what you can" free_trial: "free trial" plus_tax: "plus VAT" - total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. VAT)" min_bill_turnover_desc: "once turnover exceeds %{mbt_amount}" - business_model_configuration: "Business model configuration" say_no: "No" say_yes: "Yes" then: then @@ -82,6 +78,51 @@ en-GB: has_one_rule: "has one rule" has_n_rules: "has %{num} rules" unsaved_confirm_leave: "There are unsaved changed on this page. Continue without saving?" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Accounts & Billing" + accounts_administration_distributor: "Accounts Administration Distributor" + admin_settings: "Settings" + update_invoice: "Update Invoices" + finalise_invoice: "Finalise Invoices" + finalise_user_invoices: "Finalise User Invoices" + finalise_user_invoice_explained: "Use this button to finalise all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month." + manually_run_task: "Manually Run Task" + update_user_invoices: "Update User Invoices" + update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." + auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" + auto_update_invoices: "Auto-update invoices nightly at 1:00am" + business_model_configuration: + edit: + business_model_configuration: "Business Model" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Shop Trial Length (Days)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Percentage of turnover" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "monthly cap (excl. VAT)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Include Tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. VAT)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Add Customer" @@ -597,7 +638,6 @@ en-GB: products_max_quantity: Max quantity products_distributor: Distributor products_distributor_info: When you select a distributor for your order, their address and pickup times will be displayed here. - shop_trial_length: "Shop Trial Length (Days)" shop_trial_expires_in: "Your shopfront trial expires in" shop_trial_expired_notice: "OFN UK is a non-profit social enterprise making software affordable through open source collaboration. Thanks for being part of it!" password: Password @@ -826,16 +866,6 @@ en-GB: roles: "Roles" update: "Update" add_producer_property: "Add producer property" - admin_settings: "Settings" - update_invoice: "Update Invoices" - finalise_invoice: "Finalise Invoices" - finalise_user_invoices: "Finalise User Invoices" - finalise_user_invoice_explained: "Use this button to finalise all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month." - manually_run_task: "Manually Run Task" - update_user_invoices: "Update User Invoices" - update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." - auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" - auto_update_invoices: "Auto-update invoices nightly at 1:00am" in_progress: "In Progress" started_at: "Started at" queued: "Queued" @@ -846,8 +876,6 @@ en-GB: no_customers_found: "No customers found" go: "Go" hub: "Hub" - accounts_administration_distributor: "accounts administration distributor" - accounts_and_billing: "Accounts & Billing" producer: "Producer" product: "Product" price: "Price" diff --git a/config/locales/en-US.yml b/config/locales/en-US.yml index f7e4b29abf..4a53382d00 100644 --- a/config/locales/en-US.yml +++ b/config/locales/en-US.yml @@ -53,13 +53,10 @@ en-US: must_have_valid_business_number: "%{enterprise_name} must have a valid ABN before invoices can be sent." invoice: "Invoice" percentage_of_sales: "%{percentage} of sales" - percentage_of_turnover: "Percentage of turnover" - monthly_cap_excl_tax: "monthly cap (excl. GST)" capped_at_cap: "capped at %{cap}" per_month: "per month" free: "free" plus_tax: "plus GST" - total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. Tax)" say_no: "No" say_yes: "Yes" @@ -84,7 +81,51 @@ en-US: tag_has_rules: "Existing rules for this tag: %{num}" has_one_rule: "has one rule" has_n_rules: "has %{num} rules" - + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Accounts & Billing" + accounts_administration_distributor: "Accounts Administration Distributor" + admin_settings: "Settings" + update_invoice: "Update Invoices" + finalise_invoice: "Finalise Invoices" + finalise_user_invoices: "Finalise User Invoices" + finalise_user_invoice_explained: "Use this button to finalize all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month." + manually_run_task: "Manually Run Task " + update_user_invoices: "Update User Invoices" + update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." + auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" + auto_update_invoices: "Auto-update invoices nightly at 1:00am" + business_model_configuration: + edit: + business_model_configuration: "Business Model" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Shop Trial Length (Days)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Percentage of turnover" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "monthly cap (excl. GST)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Include Tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. Tax)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Add customer" @@ -858,16 +899,6 @@ Please follow the instructions there to make your enterprise visible on the Open roles: "Roles" update: "Update" add_producer_property: "Add producer property" - admin_settings: "Settings" - update_invoice: "Update Invoices" - finalise_invoice: "Finalise Invoices" - finalise_user_invoices: "Finalise User Invoices" - finalise_user_invoice_explained: "Use this button to finalize all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month." - manually_run_task: "Manually Run Task " - update_user_invoices: "Update User Invoices" - update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." - auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" - auto_update_invoices: "Auto-update invoices nightly at 1:00am" in_progress: "In Progress" started_at: "Started at" queued: "Queued" @@ -878,8 +909,6 @@ Please follow the instructions there to make your enterprise visible on the Open no_customers_found: "No customers found" go: "Go" hub: "Hub" - accounts_administration_distributor: "accounts administration distributor" - accounts_and_billing: "Accounts & Billing" producer: "Producer" product: "Product" price: "Price" @@ -1015,7 +1044,7 @@ Please follow the instructions there to make your enterprise visible on the Open validation_msg_product_category_cant_be_blank: "^Product Category cant be blank" validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank" validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer" - + spree: shipment_states: backorder: backorder diff --git a/config/locales/en.yml b/config/locales/en.yml index 9590047ba2..107a38e7a7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -57,16 +57,12 @@ en: must_have_valid_business_number: "%{enterprise_name} must have a valid ABN before invoices can be sent." invoice: "Invoice" percentage_of_sales: "%{percentage} of sales" - percentage_of_turnover: "Percentage of turnover" - monthly_cap_excl_tax: "monthly cap (excl. GST)" capped_at_cap: "capped at %{cap}" per_month: "per month" free: "free" free_trial: "free trial" plus_tax: "plus GST" - total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. Tax)" min_bill_turnover_desc: "once turnover exceeds %{mbt_amount}" - business_model_configuration: "Business model configuration" say_no: "No" say_yes: "Yes" then: then @@ -120,6 +116,53 @@ en: unsaved_confirm_leave: "There are unsaved changed on this page. Continue without saving?" unsaved_changes: "You have unsaved changes" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Accounts & Billing" + accounts_administration_distributor: "Accounts Administration Distributor" + admin_settings: "Settings" + update_invoice: "Update Invoices" + auto_update_invoices: "Auto-update invoices nightly at 1:00am" + finalise_invoice: "Finalise Invoices" + auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" + manually_run_task: "Manually Run Task " + update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." + finalise_user_invoices: "Finalise User Invoices" + finalise_user_invoice_explained: "Use this button to finalize all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month." + update_user_invoices: "Update User Invoices" + + business_model_configuration: + edit: + business_model_configuration: "Business Model" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Shop Trial Length (Days)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Percentage of turnover" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "monthly cap (excl. GST)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap Reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Included tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Total Monthly Bill (Incl. Tax)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." + customers: index: add_customer: "Add Customer" @@ -144,6 +187,7 @@ en: cache_settings: show: + title: Caching distributor: Distributor order_cycle: Order Cycle status: Status @@ -949,7 +993,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using products_distributor: Distributor products_distributor_info: When you select a distributor for your order, their address and pickup times will be displayed here. - shop_trial_length: "Shop Trial Length (Days)" shop_trial_expires_in: "Your shopfront trial expires in" shop_trial_expired_notice: "Good news! We have decided to extend shopfront trials until further notice." @@ -1187,16 +1230,6 @@ Please follow the instructions there to make your enterprise visible on the Open roles: "Roles" update: "Update" add_producer_property: "Add producer property" - admin_settings: "Settings" - update_invoice: "Update Invoices" - finalise_invoice: "Finalise Invoices" - finalise_user_invoices: "Finalise User Invoices" - finalise_user_invoice_explained: "Use this button to finalize all invoices in the system for the previous calendar month. This task can be set up to run automatically once a month." - manually_run_task: "Manually Run Task " - update_user_invoices: "Update User Invoices" - update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." - auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" - auto_update_invoices: "Auto-update invoices nightly at 1:00am" in_progress: "In Progress" started_at: "Started at" queued: "Queued" @@ -1207,8 +1240,6 @@ Please follow the instructions there to make your enterprise visible on the Open no_customers_found: "No customers found" go: "Go" hub: "Hub" - accounts_administration_distributor: "accounts administration distributor" - accounts_and_billing: "Accounts & Billing" producer: "Producer" product: "Product" price: "Price" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5472e1a476..fb0e32f4a0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -39,16 +39,12 @@ fr: must_have_valid_business_number: "%{enterprise_name} doit avoir un SIRET valide avant que les factures puissent être envoyées." invoice: "Facture" percentage_of_sales: "%{percentage} des ventes" - percentage_of_turnover: "Pourcentage du chiffre d'affaire" - monthly_cap_excl_tax: "plafond mensuel (sans TVA)" capped_at_cap: "plafonné à %{cap}" per_month: "par mois" free: "gratuit" free_trial: "Utilisation contre contribution libre" plus_tax: "plus TVA" - total_monthly_bill_incl_tax: "Facture mensuelle totale (taxes incluses)" min_bill_turnover_desc: "Quand le chiffre d'affaire dépasse %{mbt_amount}" - business_model_configuration: "Configuration du modèle économique" say_no: "Non" say_yes: "Oui" then: puis @@ -92,6 +88,51 @@ fr: tag_has_rules: "Règles existantes pour ce tag: %{num}" has_one_rule: "a une règle" has_n_rules: "a %{num} règles" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Compte & Facturation" + accounts_administration_distributor: "entreprise d'administration des comptes (facturation des hubs)" + admin_settings: "Paramètres" + update_invoice: "Mettre à jour les factures" + finalise_invoice: "Finaliser les factures" + finalise_user_invoices: "Finaliser les factures utilisateurs" + finalise_user_invoice_explained: "Cliquez ici pour finaliser toutes les factures pour le mois calendaire précédent. Cette tâche peut-être définie pour être opérée automatiquement une fois par mois." + manually_run_task: "Tache manuelle" + update_user_invoices: "Mettre à jour les factures utilisateurs" + update_user_invoice_explained: "Cliquez ici pour mettre à jour immédiatement les factures pour le mois en cours pour toutes les entreprises utilisant le système. Cette tache peut être définie pour s'effectuer automatiquement chaque nuit." + auto_finalise_invoices: "Finaliser automatiquement les factures le 2 de chaque mois à 01:30" + auto_update_invoices: "Mettre à jour automatiquement les factures chaque nuit à 01:00" + business_model_configuration: + edit: + business_model_configuration: "Configuration du modèle économique" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Durée de la période de test (jours)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Pourcentage du chiffre d'affaire" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "plafond mensuel (sans TVA)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap Reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Included tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Facture mensuelle totale (taxes incluses)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Ajouter un acheteur" @@ -848,7 +889,6 @@ fr: products_max_quantity: Quantité max products_distributor: Distributeur products_distributor_info: Quand vous choisissez un distributeur pour votre commande, les adresse et date de retrait seront affichées ici. - shop_trial_length: "Durée de la période de test (jours)" shop_trial_expires_in: "Votre période de test se termine dans" shop_trial_expired_notice: "Vous pouvez continuer à utiliser la plateforme en contrepartie d'une contribution libre et volontaire. Merci de nous informer de la façon dont vous souhaitez contribuer :-)" password: Mot de passe @@ -1077,16 +1117,6 @@ fr: roles: "Roles" update: "Mettre à jour" add_producer_property: "Ajouter une propriété" - admin_settings: "Paramètres" - update_invoice: "Mettre à jour les factures" - finalise_invoice: "Finaliser les factures" - finalise_user_invoices: "Finaliser les factures utilisateurs" - finalise_user_invoice_explained: "Cliquez ici pour finaliser toutes les factures pour le mois calendaire précédent. Cette tâche peut-être définie pour être opérée automatiquement une fois par mois." - manually_run_task: "Tache manuelle" - update_user_invoices: "Mettre à jour les factures utilisateurs" - update_user_invoice_explained: "Cliquez ici pour mettre à jour immédiatement les factures pour le mois en cours pour toutes les entreprises utilisant le système. Cette tache peut être définie pour s'effectuer automatiquement chaque nuit." - auto_finalise_invoices: "Finaliser automatiquement les factures le 2 de chaque mois à 01:30" - auto_update_invoices: "Mettre à jour automatiquement les factures chaque nuit à 01:00" in_progress: "En cours" started_at: "Commencé à" queued: "En attente" @@ -1097,8 +1127,6 @@ fr: no_customers_found: "Aucun acheteur trouvé" go: "Lancer" hub: "Hub" - accounts_administration_distributor: "entreprise d'administration des comptes (facturation des hubs)" - accounts_and_billing: "Compte & Facturation" producer: "Producteur" product: "Produit" price: "Prix" diff --git a/config/locales/it.yml b/config/locales/it.yml index 646fd22229..9e7842c93e 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -39,16 +39,12 @@ it: must_have_valid_business_number: "%{enterprise_name} deve avere una partita iva valida per poter emettere fattura." invoice: "Fattura" percentage_of_sales: "%{percentage} di vendite" - percentage_of_turnover: "Percentuale di fatturato" - monthly_cap_excl_tax: "tetto mensile (IVA esclusa)" capped_at_cap: "limitato a %{cap}" per_month: "al mese" free: "gratuito" free_trial: "Prova gratuita" plus_tax: "più IVA" - total_monthly_bill_incl_tax: "Conto totale mensile (tasse incluse)" min_bill_turnover_desc: "dopo the il ricambio ha superato il %{mbt_amount}" - business_model_configuration: "Configurazione del modello di business" say_no: "No" say_yes: "Sì" then: poi @@ -81,6 +77,51 @@ it: tag_has_rules: "Regole esistenti per questo tag: %{num}" has_one_rule: "ha una regola" has_n_rules: "ha %{num} regole" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Account e conti" + accounts_administration_distributor: "account amministrazione distributore" + admin_settings: "Impostazioni" + update_invoice: "Aggiorna fattura" + finalise_invoice: "Finalizza le fatture" + finalise_user_invoices: "Finalizza le fatture dell'utente" + finalise_user_invoice_explained: "Usa questo bottone per finalizzare tutte le fatture nel sistema per il precedente mese. Questo processo può essere impostato per essere fatto automaticamente una volta al mese." + manually_run_task: "Elabora il processo manualmente" + update_user_invoices: "Aggiorna le fatture dell'utente" + update_user_invoice_explained: "Usa questo bottone per aggiornare a oggi immediatamente le fatture del mese per ogni impresa del sistema. Questo processo può essere impostato per essere eseguito automaticamente ogni notte." + auto_finalise_invoices: "Auto-finalizza le fatture il 2 di ogni mese alle 01:30" + auto_update_invoices: "Auto-aggiorna le fatture di notte alle 01:00" + business_model_configuration: + edit: + business_model_configuration: "Configurazione del modello di business" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Durata della prova per negozio (Giorni)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Percentuale di fatturato" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "tetto mensile (IVA esclusa)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap Reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Included tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Conto totale mensile (tasse incluse)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Aggiungi cliente" @@ -586,7 +627,6 @@ it: products_max_quantity: Quantità massima products_distributor: Distributore products_distributor_info: Quando selezioni un distributore per il tuo ordine, i suoi indirizzi e tempi di ritiro saranno mostrati qui. - shop_trial_length: "Durata della prova per negozio (Giorni)" shop_trial_expires_in: "La prova per la tua vetrina scadrà in" shop_trial_expired_notice: "Buone notizie! Abbiamo deciso di estendere le prove dei negozi fino a nuova notifica." password: Password @@ -815,16 +855,6 @@ it: roles: "Ruoli" update: "Aggiorna" add_producer_property: "Aggiungi proprietà produttori" - admin_settings: "Impostazioni" - update_invoice: "Aggiorna fattura" - finalise_invoice: "Finalizza le fatture" - finalise_user_invoices: "Finalizza le fatture dell'utente" - finalise_user_invoice_explained: "Usa questo bottone per finalizzare tutte le fatture nel sistema per il precedente mese. Questo processo può essere impostato per essere fatto automaticamente una volta al mese." - manually_run_task: "Elabora il processo manualmente" - update_user_invoices: "Aggiorna le fatture dell'utente" - update_user_invoice_explained: "Usa questo bottone per aggiornare a oggi immediatamente le fatture del mese per ogni impresa del sistema. Questo processo può essere impostato per essere eseguito automaticamente ogni notte." - auto_finalise_invoices: "Auto-finalizza le fatture il 2 di ogni mese alle 01:30" - auto_update_invoices: "Auto-aggiorna le fatture di notte alle 01:00" in_progress: "In elaborazione" started_at: "Iniziato alle" queued: "In coda" @@ -835,8 +865,6 @@ it: no_customers_found: "Nessun cliente trovato" go: "Vai" hub: "Distributore" - accounts_administration_distributor: "account amministrazione distributore" - accounts_and_billing: "Account e conti" producer: "Produttore" product: "Prodotto" price: "Prezzo" diff --git a/config/locales/nb.yml b/config/locales/nb.yml index fcd6482e61..04fa8f01f9 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -39,16 +39,12 @@ nb: must_have_valid_business_number: "%{enterprise_name} må ha et gyldig ORG nr. før fakturaer kan sendes." invoice: "Faktura" percentage_of_sales: "%{percentage} av handel" - percentage_of_turnover: "Prosent av omsetning" - monthly_cap_excl_tax: "månedlig tak (eks. MVA)" capped_at_cap: "tak på %{cap}" per_month: "pr. måned" free: "gratis" free_trial: "gratis prøveperiode" plus_tax: "pluss MVA" - total_monthly_bill_incl_tax: "Total månedlig regning (Inkl. Avgift)" min_bill_turnover_desc: "når omsettning overstiger %{mbt_amount}" - business_model_configuration: "Utforming av forretningsmodell" say_no: "Nei" say_yes: "Ja" then: vil @@ -81,6 +77,51 @@ nb: tag_has_rules: "Gjeldende regler for denne merkelappen: %{num}" has_one_rule: "har én regel" has_n_rules: "har %{num} regler" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Bokføring & Fakturering" + accounts_administration_distributor: "bokføringsadministrasjon distributør" + admin_settings: "Innstillinger" + update_invoice: "Oppdater Fakturaer" + finalise_invoice: "Sluttfør Fakturaer" + finalise_user_invoices: "Sluttfør Brukerfakturaer" + finalise_user_invoice_explained: "Bruk denne knappen til å sluttføre alle fakturaer i systemet for forrige kalendermåned. Denne oppgaven kan settes opp til å kjøres automatisk hver måned." + manually_run_task: "Gjør Oppgave Manuelt" + update_user_invoices: "Oppdater Brukerfakturaer" + update_user_invoice_explained: "Bruk denne knappen til umiddelbart å oppdatere fakturaer for måneden frem til i dag for hver bedriftsbruker i systemet. Denne oppgaven kan settes opp til å kjøres automatisk hver natt." + auto_finalise_invoices: "Auto-sluttfør fakturaer månedlig på den 2. kl. 01:30" + auto_update_invoices: "Auto-oppdater fakturaer hver natt kl. 01:00" + business_model_configuration: + edit: + business_model_configuration: "Utforming av forretningsmodell" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Lengden av prøveperioden (dager)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Prosent av omsetning" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "månedlig tak (eks. MVA)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap Reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Included tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Total månedlig regning (Inkl. Avgift)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Legge til kunde" @@ -594,7 +635,6 @@ nb: products_max_quantity: Max mengde products_distributor: Distributør products_distributor_info: Når du velger en distributør for din bestilling, vil deres adresse og hentetider vises her. - shop_trial_length: "Lengden av prøveperioden (dager)" shop_trial_expires_in: "Din prøveperiode på butikkfront går ut om " shop_trial_expired_notice: "Gode nyheter! Vi har bestemt å forlenge butikkprøveperioder inntil ytterligere beskjed." password: Passord @@ -823,16 +863,6 @@ nb: roles: "Roller" update: "Oppdater" add_producer_property: "Legg til produsentegenskap" - admin_settings: "Innstillinger" - update_invoice: "Oppdater Fakturaer" - finalise_invoice: "Sluttfør Fakturaer" - finalise_user_invoices: "Sluttfør Brukerfakturaer" - finalise_user_invoice_explained: "Bruk denne knappen til å sluttføre alle fakturaer i systemet for forrige kalendermåned. Denne oppgaven kan settes opp til å kjøres automatisk hver måned." - manually_run_task: "Gjør Oppgave Manuelt" - update_user_invoices: "Oppdater Brukerfakturaer" - update_user_invoice_explained: "Bruk denne knappen til umiddelbart å oppdatere fakturaer for måneden frem til i dag for hver bedriftsbruker i systemet. Denne oppgaven kan settes opp til å kjøres automatisk hver natt." - auto_finalise_invoices: "Auto-sluttfør fakturaer månedlig på den 2. kl. 01:30" - auto_update_invoices: "Auto-oppdater fakturaer hver natt kl. 01:00" in_progress: "Pågår" started_at: "Startet" queued: "Satt i kø" @@ -843,8 +873,6 @@ nb: no_customers_found: "Fant ingen kunder" go: "Gå" hub: "Hub" - accounts_administration_distributor: "bokføringsadministrasjon distributør" - accounts_and_billing: "Bokføring & Fakturering" producer: "Produsent" product: "Produkt" price: "Pris" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 80d83fdb3a..37a0c05dd4 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -37,16 +37,12 @@ pt-BR: confirm_resend_order_confirmation: "Tem certeza que deseja enviar novamente o pedido de confirmação do email?" invoice: "Fatura" percentage_of_sales: "%{percentage} de vendas" - percentage_of_turnover: " \"Percentual de faturamento\"" - monthly_cap_excl_tax: "limite mensal (taxas exclusas)" capped_at_cap: "limitado em %{cap}" per_month: "ao mês" free: "grátis" free_trial: "faça um teste grátis" plus_tax: "mais taxas" - total_monthly_bill_incl_tax: "Total mensal (taxas inclusas)" min_bill_turnover_desc: "uma vez que o volume de negócio exceder %{mbt_amount}" - business_model_configuration: "Configuração do modelo de negócios" say_no: "Não" say_yes: "Sim" then: então @@ -78,6 +74,51 @@ pt-BR: tag_has_rules: "Regras existentes para essa tag: %{num}" has_one_rule: "possui uma regra" has_n_rules: "tem %{num} regras" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Contas e Faturamento" + accounts_administration_distributor: "distribuidor de administração de contas" + admin_settings: "Preferências do Sistema" + update_invoice: "Atualizar faturas" + finalise_invoice: "Finalizar Faturas" + finalise_user_invoices: "Finalizar Faturas de Usuário" + finalise_user_invoice_explained: "Usar este botão para finalizar todos as faturas no sistema para o calendário do mês anterior. " + manually_run_task: "Rodar Tarefa Manualmente" + update_user_invoices: "Atualizar Fatura de Usuário" + update_user_invoice_explained: "Usar este botão para atualizar imediamente todas as faturas no sistema para o mês atual, para cada usuário da empresa no sistema. Essa tarefa pode ser automatizada para rodar automaticamente toda noite. " + auto_finalise_invoices: "Finalizar automaticamente as faturas no dia 2 de cada mês, à 1:30am" + auto_update_invoices: "Atualizar automaticamente faturas toda as noites, a 1:00 am" + business_model_configuration: + edit: + business_model_configuration: "Configuração do modelo de negócios" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Duração de Avaliação da Loja (dias)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: " \"Percentual de faturamento\"" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "limite mensal (taxas exclusas)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap Reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Included tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Total mensal (taxas inclusas)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Adicionar Cliente" @@ -588,7 +629,6 @@ pt-BR: products_max_quantity: Quantidade máxima products_distributor: Distribuidor products_distributor_info: Quando você selecionar um distribuidor para seu pedido, o endereço e data para retirada serão exibidos aqui. - shop_trial_length: "Duração de Avaliação da Loja (dias)" shop_trial_expires_in: "O período de avaliação do mercado termina em " shop_trial_expired_notice: "Boa notícia! Decidimos extender o período avaliação do mercado até segunda ordem. " password: Senha @@ -811,16 +851,6 @@ pt-BR: roles: "Papeis" update: "Atualizar" add_producer_property: "Adicionar produtor" - admin_settings: "Preferências do Sistema" - update_invoice: "Atualizar faturas" - finalise_invoice: "Finalizar Faturas" - finalise_user_invoices: "Finalizar Faturas de Usuário" - finalise_user_invoice_explained: "Usar este botão para finalizar todos as faturas no sistema para o calendário do mês anterior. " - manually_run_task: "Rodar Tarefa Manualmente" - update_user_invoices: "Atualizar Fatura de Usuário" - update_user_invoice_explained: "Usar este botão para atualizar imediamente todas as faturas no sistema para o mês atual, para cada usuário da empresa no sistema. Essa tarefa pode ser automatizada para rodar automaticamente toda noite. " - auto_finalise_invoices: "Finalizar automaticamente as faturas no dia 2 de cada mês, à 1:30am" - auto_update_invoices: "Atualizar automaticamente faturas toda as noites, a 1:00 am" in_progress: "Em andamento" started_at: "Começou em " queued: "Aguardando" @@ -831,8 +861,6 @@ pt-BR: no_customers_found: "Nenhum cliente encontrado" go: "Ir" hub: "Central" - accounts_administration_distributor: "distribuidor de administração de contas" - accounts_and_billing: "Contas e Faturamento" producer: "Produtor" product: "Produto" price: "Preço" diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 485cb18a3f..66548ea241 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -39,16 +39,12 @@ sv: must_have_valid_business_number: "%{enterprise_name} måste ha ett giltigt organisationsnummer innan fakturor kan skickas." invoice: "Faktura" percentage_of_sales: "%{percentage} av försäljning" - percentage_of_turnover: "Procent av omsättning" - monthly_cap_excl_tax: "månatligt tak (exkl. moms)" capped_at_cap: "begränsat till %{cap}" per_month: "per månad" free: "gratis" free_trial: "prova gratis" plus_tax: "plus Moms" - total_monthly_bill_incl_tax: "Total Månadskostnad (Inkl. Skatter)" min_bill_turnover_desc: "när omsättning överskrider %{mbt_amount}" - business_model_configuration: "Konfigurera affärsmodell" say_no: "Nej" say_yes: "Ja" then: då @@ -81,6 +77,51 @@ sv: tag_has_rules: "Regler för denna tagg: %{num}" has_one_rule: "har en regel" has_n_rules: "har %{num} regler" + accounts_and_billing_settings: + method_settings: + default_accounts_payment_method: "Default Accounts Payment Method" + default_accounts_shipping_method: "Default Accounts Shipping Method" + edit: + accounts_and_billing: "Konton och fakturering" + accounts_administration_distributor: "distributör av bokföringsadministration" + admin_settings: "Inställningar" + update_invoice: "Uppdatera fakturor" + finalise_invoice: "Slutför fakturor" + finalise_user_invoices: "Slutför användarafakturor" + finalise_user_invoice_explained: "Använd den här knappen för att slutföra alla fakturor i systemet för den gångna månaden. Denna uppgift ställas in så att den utförs automatiskt en gång per månad." + manually_run_task: "Manuellt utförda uppgifter" + update_user_invoices: "Uppdatera användarfakturor" + update_user_invoice_explained: "Använd denna knapp för att omedelbart uppdatera alla fakturor innevarande månad för alla företag i systemet. Den här uppgiften kan ställas in så att den automatiskt utförs varje natt." + auto_finalise_invoices: "Automatisk summering av fakturor den 2:a kl 01.30 " + auto_update_invoices: "Automatisk uppdatering av fakturor varje natt kl 01.00" + business_model_configuration: + edit: + business_model_configuration: "Konfigurera affärsmodell" + business_model_configuration_tip: "Configure the rate at which shops will be charged each month for use of the Open Food Network." + bill_calculation_settings: "Bill Calculation Settings" + bill_calculation_settings_tip: "Adjust the amount that enterprises will be billed each month for use of the OFN." + shop_trial_length: "Försökstiden är (dagar)" + shop_trial_length_tip: "The length of time (in days) that enterprises who are set up as shops can run as a trial period." + fixed_monthly_charge: "Fixed Monthly Charge" + fixed_monthly_charge_tip: "A fixed monthly charge for all enterprises who are set up as a shop and have exceeded the minimum billable turnover (if set)." + percentage_of_turnover: "Procent av omsättning" + percentage_of_turnover_tip: "When greater than zero, this rate (0.0 - 1.0) will be applied to the total turnover of each shop and added to any fixed charges (to the left) to calculate the monthly bill." + monthly_cap_excl_tax: "månatligt tak (exkl. moms)" + monthly_cap_excl_tax_tip: "When greater than zero, this value will be used as a cap on the amount that shops will be charged each month." + tax_rate: "Tax Rate" + tax_rate_tip: "Tax rate that applies to the the monthly bill that enterprises are charged for using the system." + minimum_monthly_billable_turnover: "Minimum Monthly Billable Turnover" + minimum_monthly_billable_turnover_tip: "Minimum monthly turnover before a shopfront will be charged for using OFN. Enterprises turning over less than this amount in a month will not be charged, either as a percentage or fixed rate." + example_bill_calculator: "Example Bill Calculator" + example_bill_calculator_legend: "Alter the example turnover to visualise the effect of the settings to the left." + example_monthly_turnover: "Example Monthly Turnover" + example_monthly_turnover_tip: "An example monthly turnover for an enterprise which will be used to generate calculate an example monthly bill below." + cap_reached?: "Cap Reached ?" + cap_reached?_tip: "Whether the cap (specified to the left) has been reached, given the settings and the turnover provided." + included_tax: "Included tax" + included_tax_tip: "The total tax included in the example monthly bill, given the settings and the turnover provided." + total_monthly_bill_incl_tax: "Total Månadskostnad (Inkl. Skatter)" + total_monthly_bill_incl_tax_tip: "The example total monthly bill with tax included, given the settings and the turnover provided." customers: index: add_customer: "Lägg till kund" @@ -594,7 +635,6 @@ sv: products_max_quantity: Maxkvantitet products_distributor: Distributör products_distributor_info: När du väljer distributör för din order kommer leveranstider att visas här - shop_trial_length: "Försökstiden är (dagar)" shop_trial_expires_in: "Din försökstid för skyltfönster gå ut om" shop_trial_expired_notice: "Goda nyheter! Vi har beslutat utöka skyltfönstrets försökstid tills vidare. " password: Lösenord @@ -823,16 +863,6 @@ sv: roles: "Uppgifter" update: "Uppdatera" add_producer_property: "Lägg till producentegenskaper" - admin_settings: "Inställningar" - update_invoice: "Uppdatera fakturor" - finalise_invoice: "Slutför fakturor" - finalise_user_invoices: "Slutför användarafakturor" - finalise_user_invoice_explained: "Använd den här knappen för att slutföra alla fakturor i systemet för den gångna månaden. Denna uppgift ställas in så att den utförs automatiskt en gång per månad." - manually_run_task: "Manuellt utförda uppgifter" - update_user_invoices: "Uppdatera användarfakturor" - update_user_invoice_explained: "Använd denna knapp för att omedelbart uppdatera alla fakturor innevarande månad för alla företag i systemet. Den här uppgiften kan ställas in så att den automatiskt utförs varje natt." - auto_finalise_invoices: "Automatisk summering av fakturor den 2:a kl 01.30 " - auto_update_invoices: "Automatisk uppdatering av fakturor varje natt kl 01.00" in_progress: "Under bearbetning" started_at: "Startade kl" queued: "Köad" @@ -843,8 +873,6 @@ sv: no_customers_found: "Inga kunder hittade" go: "Kör igång" hub: "Matställe" - accounts_administration_distributor: "distributör av bokföringsadministration" - accounts_and_billing: "Konton och fakturering" producer: "Producent" product: "Produkt" price: "Pris" diff --git a/spec/features/admin/business_model_configuration_spec.rb b/spec/features/admin/business_model_configuration_spec.rb index ab5e4fd2e7..a16a23976e 100644 --- a/spec/features/admin/business_model_configuration_spec.rb +++ b/spec/features/admin/business_model_configuration_spec.rb @@ -42,7 +42,7 @@ feature 'Business Model Configuration' do click_button "Update" - expect(page).to have_content "Business model configuration has been successfully updated!" + expect(page).to have_content "Business Model has been successfully updated!" expect(Spree::Config.account_invoices_monthly_fixed).to eq 10 expect(Spree::Config.account_invoices_monthly_rate).to eq 0.05 expect(Spree::Config.account_invoices_monthly_cap).to eq 30