From 1874f55fa4ee93609c8ed8de7e367d15a300bc7b Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 3 Apr 2019 03:14:14 +1100 Subject: [PATCH 01/29] Updating translations for config/locales/pt.yml --- config/locales/pt.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/config/locales/pt.yml b/config/locales/pt.yml index ba45be4fba..5c45400a8c 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -204,7 +204,7 @@ pt: edit: Editar clone: Clonar distributors: Distribuidores - bulk_order_management: Gestão de Encomendas por Atacado + bulk_order_management: Gestão de Encomendas em Massa enterprises: Organizações enterprise_groups: Grupos reports: Relatórios @@ -609,7 +609,7 @@ pt: product_unit: "Produto: Unidade" weight_volume: "Peso/Volume" ask: "Perguntar?" - page_title: "Gestão de Encomendas por Atacado" + page_title: "Gestão de Encomendas em Massa" actions_delete: "Apagar o Selecionado" loading: "Carregando encomendas" no_results: "Nenhuma encomenda encontrada. " @@ -858,6 +858,8 @@ pt: welcome_text: Você criou com sucesso uma next_step: Passo seguinte choose_starting_point: 'Escolha o seu pacote:' + profile: 'Perfil' + producer_profile: 'Perfil do Produtor' invite_manager: user_already_exists: "O/A utilizador/a já existe" error: "Algo correu mal" @@ -991,8 +993,8 @@ pt: name: Encomendas e Distribuidores description: Encomendas com detalhes do distribuidor bulk_coop: - name: Cooperativa por Atacado - description: Relatórios de Encomendas de Cooperativas por Atacado + name: Compra em Grupo + description: Relatórios de Encomendas de Compra em Grupo payments: name: Relatórios de Pagamentos description: Relatórios de Pagamentos @@ -1869,7 +1871,7 @@ pt: accounts_and_billing_start_task_notice: "Tarefa colocada em fila" fees: "Taxas" item_cost: "Custo da unidade" - bulk: "Por Atacado" + bulk: "Em Massa" shop_variant_quantity_min: "mín." shop_variant_quantity_max: "max." follow: "Seguir" @@ -2150,7 +2152,7 @@ pt: report_header_distributor_postcode: Código postal do distribuidor report_header_delivery_address: Morada de Entrega report_header_delivery_postcode: Código Postal da Entrega - report_header_bulk_unit_size: Tamanho Unitário por Atacado + report_header_bulk_unit_size: Tamanho Unitário em Massa report_header_weight: Peso report_header_sum_total: Soma Total report_header_date_of_order: Data da encomenda @@ -2460,6 +2462,7 @@ pt: pending: "pendente" ready: "pronto" shipped: "enviado" + canceled: "cancelado" payment_states: balance_due: "saldo pendente" completed: "completado" @@ -2781,7 +2784,7 @@ pt: tab: dashboard: "Painel de controlo" orders: "Encomendas" - bulk_order_management: "Gestão de Encomendas por Atacado" + bulk_order_management: "Gestão de Encomendas em Massa" subscriptions: "Subscrições" products: "Produtos" option_types: "Tipos de Opções" @@ -2880,7 +2883,7 @@ pt: unit_name_placeholder: 'ex: ramos' index: header: - title: Editar Produtos por Atacado + title: Editar Produtos indicators: title: A CARREGAR PRODUTOS no_products: "Ainda sem produtos. Porque não acrescenta alguns?" @@ -2903,17 +2906,17 @@ pt: product_category: Categoria de Produto group_buy_form: group_buy: "Compra em grupo?" - bulk_unit_size: Tamanho unitário por atacado + bulk_unit_size: Tamanho unitário em massa display_as: display_as: Mostrar como reports: table: select_and_search: "Selecione os filtros e carregue em %{option} para ver os seus dados." bulk_coop: - bulk_coop_supplier_report: 'Cooperativa por Atacado - Totais por Fornecedor' - bulk_coop_allocation: 'Cooperativa por Atacado - Alocação' - bulk_coop_packing_sheets: 'Cooperativa por Atacado - Folhas de Empacotamento' - bulk_coop_customer_payments: 'Cooperativa por Atacado - Pagamentos do Consumidor' + bulk_coop_supplier_report: 'Compra em Grupo - Totais por Fornecedor' + bulk_coop_allocation: 'Compra em Grupo - Alocação' + bulk_coop_packing_sheets: 'Compra em Grupo - Folhas de Empacotamento' + bulk_coop_customer_payments: 'Compra em Grupo - Pagamentos do Consumidor' enterprise_fee_summaries: filters: date_range: "Intervalo de Datas" From 4b60a75eaebe70b1cf64621d31a71a5f1a1ebb81 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Thu, 4 Apr 2019 23:22:59 +1100 Subject: [PATCH 04/29] Updating translations for config/locales/ca.yml --- config/locales/ca.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index ca114ce898..d945250c6c 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -859,6 +859,8 @@ ca: welcome_text: Heu creat correctament un next_step: Següent pas choose_starting_point: 'Escull el teu perfil:' + profile: 'Perfil' + producer_profile: 'Perfil de productora' invite_manager: user_already_exists: "L'usuari ja existeix" error: "Alguna cosa ha anat malament" @@ -2462,6 +2464,7 @@ ca: pending: "pendents" ready: "llest" shipped: "enviat" + canceled: "cancel·lat" payment_states: balance_due: "a pagar" completed: "completat" @@ -2741,6 +2744,7 @@ ca: back_to_taxonomies_list: "Torna a la llista de taxonomies" shipping_methods: "Mètodes d'enviament" shipping_categories: "Tipus d'enviament" + new_shipping_category: "Nova categoria d’enviament" back_to_shipping_categories: "Tornar a les categories d'enviament" analytics_trackers: "Rastrejadors d'anàlisi" no_trackers_found: "No s'ha trobat cap rastrejador" From 8d69180c8c34cd48946c7d6c9583c2b0e2d2efd1 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Thu, 4 Apr 2019 23:23:06 +1100 Subject: [PATCH 05/29] Updating translations for config/locales/es.yml --- config/locales/es.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/es.yml b/config/locales/es.yml index 475948ca30..69fff959cb 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -859,6 +859,8 @@ es: welcome_text: Has creado correctamente un next_step: Siguiente paso choose_starting_point: 'Selecciona tu perfil:' + profile: 'Perfil' + producer_profile: 'Perfil Productora' invite_manager: user_already_exists: "El usuario ya existe" error: "Algo salió mal" @@ -2463,6 +2465,7 @@ es: pending: "pendiente" ready: "Listo" shipped: "enviado" + canceled: "cancelado" payment_states: balance_due: "saldo debido" completed: "completado" @@ -2742,6 +2745,7 @@ es: back_to_taxonomies_list: "Volver a la Lista de Taxonomías" shipping_methods: "Métodos de envío" shipping_categories: "Categorías de envío" + new_shipping_category: "Nueva categoría de envío" back_to_shipping_categories: "Volver a las categorías de envío" analytics_trackers: "Analizadores de seguimiento" no_trackers_found: "No se encontraron rastreadores" From bf203766679eab351dbe4e95a99db526958a3d46 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Thu, 4 Apr 2019 15:40:28 +0200 Subject: [PATCH 06/29] Add Delayed Job Web for superadmins only This adds https://github.com/ejschmitt/delayed_job_web to enable async job management such as retries, removal of failed jobs, etc. Only superadmins can access this web UI though. Therefore any sysadmin that needs to use it should have access to the appropriate instance superadmin credentials in Bitwarden. --- Gemfile | 1 + Gemfile.lock | 12 ++++++++++++ config/routes/admin.rb | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/Gemfile b/Gemfile index 374f59ac6a..9232a45e47 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,7 @@ gem 'jwt', '~> 2.1' gem 'delayed_job_active_record' gem 'daemons' +gem 'delayed_job_web' # Fix bug in simple_form preventing collection_check_boxes usage within form_for block # When merged, revert to upstream gem diff --git a/Gemfile.lock b/Gemfile.lock index d2498638ed..48fe062c13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -277,6 +277,11 @@ GEM delayed_job_active_record (4.1.3) activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) + delayed_job_web (1.4.3) + activerecord (> 3.0.0) + delayed_job (> 2.0.3) + rack-protection (>= 1.5.5) + sinatra (>= 1.4.4) devise (2.2.8) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -599,6 +604,8 @@ GEM rack (>= 0.4) rack-mini-profiler (0.10.7) rack (>= 1.2.0) + rack-protection (1.5.5) + rack rack-rewrite (1.5.1) rack-ssl (1.3.4) rack @@ -710,6 +717,10 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) + sinatra (1.4.6) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) skylight (1.7.2) activesupport (>= 3.0.0) spinjs-rails (1.4) @@ -802,6 +813,7 @@ DEPENDENCIES debugger-linecache deface! delayed_job_active_record + delayed_job_web diffy eventmachine (>= 1.2.3) factory_bot_rails diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 1f55f8d154..f79a3eb742 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -1,5 +1,10 @@ Openfoodnetwork::Application.routes.draw do namespace :admin do + + authenticated :spree_user, -> user { user.has_spree_role?('admin') } do + mount DelayedJobWeb, at: '/delayed_job' + end + resources :bulk_line_items resources :order_cycles do From aa3f0ac577a9594699b038416ff3e8eefa418bca Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Thu, 4 Apr 2019 15:51:37 +0200 Subject: [PATCH 07/29] Reuse #superadmin? in Delayed Job Web route This moves #superadmin? to the user decorator so it can be reused outside FeatureFlags. --- app/models/feature_flags.rb | 12 ++---------- app/models/spree/user_decorator.rb | 8 ++++++++ config/routes/admin.rb | 2 +- spec/models/feature_flags_spec.rb | 4 ++-- spec/models/spree/user_spec.rb | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/app/models/feature_flags.rb b/app/models/feature_flags.rb index 096ef44fcc..70dcf1c04d 100644 --- a/app/models/feature_flags.rb +++ b/app/models/feature_flags.rb @@ -11,25 +11,17 @@ class FeatureFlags # # @return [Boolean] def product_import_enabled? - superadmin? + user.superadmin? end # Checks whether the "Enterprise Fee Summary" is enabled for the specified user # # @return [Boolean] def enterprise_fee_summary_enabled? - superadmin? + user.superadmin? end private attr_reader :user - - # Checks whether the specified user is a superadmin, with full control of the - # instance - # - # @return [Boolean] - def superadmin? - user.has_spree_role?('admin') - end end diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb index dec0309d2b..7b43d39b90 100644 --- a/app/models/spree/user_decorator.rb +++ b/app/models/spree/user_decorator.rb @@ -74,6 +74,14 @@ Spree.user_class.class_eval do credit_cards.where(is_default: true).first end + # Checks whether the specified user is a superadmin, with full control of the + # instance + # + # @return [Boolean] + def superadmin? + has_spree_role?('admin') + end + private def limit_owned_enterprises diff --git a/config/routes/admin.rb b/config/routes/admin.rb index f79a3eb742..e46ef5917a 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -1,7 +1,7 @@ Openfoodnetwork::Application.routes.draw do namespace :admin do - authenticated :spree_user, -> user { user.has_spree_role?('admin') } do + authenticated :spree_user, -> user { user.superadmin? } do mount DelayedJobWeb, at: '/delayed_job' end diff --git a/spec/models/feature_flags_spec.rb b/spec/models/feature_flags_spec.rb index 6b9380b879..b2ca275648 100644 --- a/spec/models/feature_flags_spec.rb +++ b/spec/models/feature_flags_spec.rb @@ -7,7 +7,7 @@ describe FeatureFlags do describe '#product_import_enabled?' do context 'when the user is superadmin' do before do - allow(user).to receive(:has_spree_role?).with('admin') { true } + allow(user).to receive(:superadmin?) { true } end it 'returns true' do @@ -17,7 +17,7 @@ describe FeatureFlags do context 'when the user is not superadmin' do before do - allow(user).to receive(:has_spree_role?).with('admin') { false } + allow(user).to receive(:superadmin?) { false } end it 'returns false' do diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb index 7169930489..801d9ef9a7 100644 --- a/spec/models/spree/user_spec.rb +++ b/spec/models/spree/user_spec.rb @@ -162,4 +162,22 @@ describe Spree.user_class do end end end + + describe '#superadmin?' do + let(:user) { create(:user) } + + context 'when the user has an admin spree role' do + before { user.spree_roles << Spree::Role.create(name: 'admin') } + + it 'returns true' do + expect(user.superadmin?).to eq(true) + end + end + + context 'when the user does not have an admin spree role' do + it 'returns false' do + expect(user.superadmin?).to eq(false) + end + end + end end From 545f2fefa4f68fa9e22003b609896aaae46b6be1 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Fri, 5 Apr 2019 04:36:07 +1100 Subject: [PATCH 08/29] Updating translations for config/locales/fr.yml --- config/locales/fr.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b53e81a4f6..b26af615bf 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -858,6 +858,8 @@ fr: welcome_text: 'Vous avez créé avec succès ' next_step: Etape suivante choose_starting_point: 'Choisir votre type d''entreprise:' + profile: 'Profil' + producer_profile: 'Profil producteur' invite_manager: user_already_exists: "Le compte existe déjà" error: "Un problème est survenu" @@ -2468,6 +2470,7 @@ fr: pending: "en attente" ready: "prêt" shipped: "envoyé" + canceled: "annulé" payment_states: balance_due: "solde dû" completed: "effectué" @@ -2845,6 +2848,9 @@ fr: title: "Distribution" distributor: "Distributeur : " order_cycle: "Cycle de vente : " + line_item_adjustments: "Ajustements sur ligne produit" + order_adjustments: "Ajustements sur la commande" + order_total: "Total Commande" overview: products: active_products: From 74b7418f597952a4ba53279651cf9e259020bc9f Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Fri, 5 Apr 2019 04:39:15 +1100 Subject: [PATCH 09/29] Updating translations for config/locales/fr.yml --- config/locales/fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b26af615bf..8ba28786d5 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -2848,7 +2848,7 @@ fr: title: "Distribution" distributor: "Distributeur : " order_cycle: "Cycle de vente : " - line_item_adjustments: "Ajustements sur ligne produit" + line_item_adjustments: "Ajustements sur la ligne produit" order_adjustments: "Ajustements sur la commande" order_total: "Total Commande" overview: From 231fa28713aee2f52099e467ef2bade5ed40ab7a Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Sat, 6 Apr 2019 00:24:05 +1100 Subject: [PATCH 10/29] Updating translations for config/locales/en_US.yml --- config/locales/en_US.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml index 7c5fdfc024..55e10ed2ac 100644 --- a/config/locales/en_US.yml +++ b/config/locales/en_US.yml @@ -857,6 +857,8 @@ en_US: welcome_text: You have successfully created a next_step: Next step choose_starting_point: 'Choose your package:' + profile: 'Profile' + producer_profile: 'Producer Profile' invite_manager: user_already_exists: "User already exists" error: "Something went wrong" @@ -2457,6 +2459,7 @@ en_US: pending: "pending" ready: "ready" shipped: "shipped" + canceled: "cancelled" payment_states: balance_due: "balance due" completed: "completed" @@ -2833,6 +2836,9 @@ en_US: title: "Distribution" distributor: "Distributor:" order_cycle: "Order cycle:" + line_item_adjustments: "Line Item Adjustments" + order_adjustments: "Order Adjustments" + order_total: "Order Total" overview: products: active_products: From f5ab89eb03275887bef9c29cf29a6446ca16088e Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Sat, 6 Apr 2019 07:38:45 +1100 Subject: [PATCH 12/29] Updating translations for config/locales/it.yml --- config/locales/it.yml | 297 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 288 insertions(+), 9 deletions(-) diff --git a/config/locales/it.yml b/config/locales/it.yml index 61804b7ebc..d4f63d1943 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -35,9 +35,12 @@ it: activemodel: attributes: order_management/reports/enterprise_fee_summary/parameters: + start_at: "Inizio" + end_at: "Fine" distributor_ids: "Distributori" producer_ids: "Produttori" order_cycle_ids: "Cicli di richiesteCicli di richieste" + enterprise_fee_ids: "Nome commissione" shipping_method_ids: "Metodi di spedizione" payment_method_ids: "Metodi di pagamento" errors: @@ -83,6 +86,13 @@ it: models: order_cycle: cloned_order_cycle_name: "COPIA DI %{order_cycle}" + validators: + date_time_string_validator: + not_string_error: "Deve essere una linea" + invalid_format_error: "Deve essere valido" + integer_array_validator: + not_array_error: "Deve essere una sequenza" + invalid_element_error: "Deve contenere solo numeri interi" enterprise_mailer: confirmation_instructions: subject: "Per favore conferma l'indirizzo email per %{enterprise}" @@ -232,6 +242,8 @@ it: quantity: Quantità pick_up: Ritiro copy: Copia + change_my_password: "Cambia la mia password" + update_password: "Aggiorna password" password_confirmation: 'Conferma password ' reset_password_token: Token per il reset della password expired: è scaduto, si prega di richiederne uno nuovo @@ -336,10 +348,23 @@ it: fixed_monthly_charge: "Tariffa fissa mensile" fixed_monthly_charge_tip: "Un importo fisso mensile per le aziende impostate come negozio che superano il volume di affari minimo (se stabilito)." percentage_of_turnover: "Percentuale del fatturato" + percentage_of_turnover_tip: "Quando superiore a zero, questo tasso (0.0 - 1.0) verrà applicato al fatturato totale di ciascun negozio e aggiunto a eventuali costi fissi (a sinistra) per calcolare la fattura mensile." monthly_cap_excl_tax: "Tetto mensile (excl. GST)" + monthly_cap_excl_tax_tip: "Quando è maggiore di zero, questo valore verrà utilizzato come limite sull'ammontare che i negozi addebiteranno ogni mese." tax_rate: "Aliquota d'imposta" + tax_rate_tip: "Importo applicato al conto mensile addebitato alle aziende per l'utilizzo del sistema." + minimum_monthly_billable_turnover: "Importo fatturabile mensile minimo" + minimum_monthly_billable_turnover_tip: "Fatturato mensile sotto il quale i \"negozi\" non dovranno pagare la commissione per l'utilizzo di OFN." + example_bill_calculator: "Esempio calcolatore commissione" + example_bill_calculator_legend: "Modifica il calcolatore per visualizzare gli effetti delle impostazioni a sinistra." + example_monthly_turnover: "Esempio calcolo mensile" + example_monthly_turnover_tip: "Un esempio di calcolatore per le aziende, che può essere utilizzato per calcolare un esempio di conto mensile" cap_reached?: "Limite raggiunto?" + cap_reached?_tip: "Se è stato raggiunto il limite (specificato a sinistra), date le impostazioni e il fatturato fornito." included_tax: "Tasse incluse" + included_tax_tip: "L'imposta totale inclusa nell'esempio fattura mensile, date le impostazioni e il fatturato fornito." + total_monthly_bill_incl_tax: "Conto totale mensile (tasse incluse)" + total_monthly_bill_incl_tax_tip: "La fattura mensile totale di esempio con tasse incluse, date le impostazioni e il fatturato fornito." cache_settings: edit: title: "Immagazzinando" @@ -348,9 +373,11 @@ it: status: "Stato" diff: "Diff" error: "Errore" + enable_products_cache: "Abilita la cache dei prodotti?" invoice_settings: edit: title: Impostazioni fatturazione + invoice_style2?: Utilizzare il modello di fattura alternativa che include la ripartizione totale delle imposte per tariffa e le informazioni sulla tariffa fiscale per articolo (non ancora adatto per i paesi che visualizzano i prezzi al netto delle imposte) enable_receipt_printing?: Visualizzo le opzioni per stampare la ricevuta usando la stampante termica nel menù a cascata? stripe_connect_settings: edit: @@ -472,6 +499,7 @@ it: none_saved: Nessun prodotto salvato con successo line_number: "Linea %{number}:" encoding_error: "Controlla l'impostazione della lingua del file sorgente e assicurati che sia salvato con la codifica UTF-8." + unexpected_error: "L'importazione del prodotto ha incontrato un errore imprevisto durante l'apertura del file:%{error_message}" index: select_file: Seleziona un foglio di calcolo da caricare spreadsheet: Foglio di calcolo @@ -831,6 +859,8 @@ it: welcome_text: Hai creato con successo una next_step: Prossimo passo choose_starting_point: 'Scegli il tuo imballaggio:' + profile: 'Profilo' + producer_profile: 'Profilo produttore' invite_manager: user_already_exists: "L'Utente esiste già" error: "Qualcosa è andato storto" @@ -990,6 +1020,9 @@ it: description: Fatture per importazione in Xero packing: name: Resoconti smistamento/imballaggio + enterprise_fee_summary: + name: "Riepilogo commissioni dell'azienda" + description: "Riepilogo delle commissioni dell'azienda" subscriptions: subscriptions: Abbonamenti new: Nuovo Abbonamento @@ -1023,6 +1056,7 @@ it: this_is_an_estimate: | I prezzi visualizzati sono solo una stima e saranno calcolati nel momento in cui l'abbonamento verrà cambiato. Se cambi i prezzi o le tariffe, le gentili richieste saranno aggiornate, ma l'abbonamento visualizzerà ancora i valori precedenti + not_in_open_and_upcoming_order_cycles_warning: "Non ci sono cicli di richieste aperte o in apertura per questo prodotto." details: details: Dettagli invalid_error: Oops! Per favore compila i campi obbligatori... @@ -1037,6 +1071,7 @@ it: details: Dettagli address: Indirizzo products: Prodotti + no_open_or_upcoming_order_cycle: "Non sono previsti cicli di richieste." product_already_in_order: Questo prodotto è già stato aggiunto alla gentile richiesta. Per favore modifica direttamente la quantità. orders: number: Numero @@ -1047,6 +1082,8 @@ it: pause_failure_msg: 'Spiacente, pausa fallita!' confirm_unpause_msg: Sei sicura/o di voler riprendere questo abbonamento? unpause_failure_msg: 'Ci dispiace, ripresa non riuscita!' + confirm_cancel_open_orders_msg: "Alcune di queste richieste sono attualmente attive. I consumatori sono già stati avvisati che le richieste verranno soddisfatte. Vuoi eliminare questa/e richiesta/e o mantenerla?" + resume_canceled_orders_msg: "Alcuni ordini per questo abbonamento possono essere ripresi in questo momento. Puoi riprenderli dal menu a discesa degli ordini." yes_cancel_them: Cancella l'articolo no_keep_them: Tieni l'articolo yes_i_am_sure: Si', sono sicuro @@ -1150,19 +1187,19 @@ it: ticket_column_unit_price: "Prezzo unitario" ticket_column_total_price: "Prezzo totale" menu_1_title: "Negozi" - menu_1_url: "/negozi" + menu_1_url: "/shops" menu_2_title: "Mappa" - menu_2_url: "/mappa" + menu_2_url: "/map" menu_3_title: "Produttori" - menu_3_url: "/produttori" + menu_3_url: "/producers" menu_4_title: "Gruppi" - menu_4_url: "/gruppi" + menu_4_url: "/groups" menu_5_title: "About" - menu_5_url: "http://www.openfoodnetwork.org/" - menu_6_title: "Connetti" - menu_6_url: "https://openfoodnetwork.org/au/connect/" - menu_7_title: "Impara" - menu_7_url: "https://openfoodnetwork.org/au/learn/" + menu_5_url: "http://apropos.openfoodfrance.org/" + menu_6_title: "Blog" + menu_6_url: "https://apropos.openfoodfrance.org/blog/" + menu_7_title: "Support" + menu_7_url: "https://apropos.openfoodfrance.org/support/" logo: "Logo (640x130)" logo_mobile: "Mobile logo (75x26)" logo_mobile_svg: "Mobile logo (SVG)" @@ -1204,6 +1241,7 @@ it: no_shipping_or_payment: nessuna modalità di spedizione o di pagamento unconfirmed: non confermato days: giorni + authorization_failure: "Errore di autorizzazione" label_shop: "Negozio" label_shops: "Negozi" label_map: "Mappa" @@ -1263,18 +1301,34 @@ it: essential_cookies_note: "La maggior parte dei cookie contiene solo un identificatore univoco, ma non altri dati, per cui indirizzo e-mail e password, ad esempio, non sono mai contenuti in essi e mai esposti." cookie_domain: "Impostato da" cookie_session_desc: "Utilizzato per consentire al sito web di ricordare gli utenti tra una visita e l'altra, ad esempio, di ricordare gli articoli nel carrello." + cookie_consent_desc: "Utilizzato per mantenere il consenso dell'utente per la memorizzazione dei cookie" + cookie_remember_me_desc: "Utilizzato se l'utente ha richiesto al sito di ricordarlo. Il cookie è cancellato automaticamente dopo 12 giorni. Se come utente vuoi che quel cookie sia cancellato, devi solo fare il logout. Se non vuoi che il cookie sia installato sul tuo computer, non flaggare \"ricordami\" quando fai il log in." cookie_openstreemap_desc: "Utilizzato dal nostro amichevole fornitore di mappe open source (OpenStreetMap) per assicurare che non riceva troppe richieste in un dato periodo di tempo, per prevenire l'abuso dei loro servizi." + cookie_stripe_desc: "Dati raccolti dal nostro processore di pagamento Stripe per il rilevamento di frodi https://stripe.com/cookies-policy/legal. Non tutti i negozi usano Stripe come metodo di pagamento, ma è una buona pratica evitare che le frodi lo applichino a tutte le pagine. Stripe probabilmente costruisce un'immagine di quali delle nostre pagine di solito interagiscono con le loro API e quindi segnala qualcosa di insolito. Pertanto, l'impostazione del cookie Stripe ha una funzione più ampia rispetto alla semplice fornitura di un metodo di pagamento a un utente. La sua rimozione potrebbe influire sulla sicurezza del servizio stesso. Puoi saperne di più su Stripe e leggere la sua informativa sulla privacy all'indirizzo https://stripe.com/privacy." statistics_cookies: "Cookies di statistica" + statistics_cookies_desc: "Ciò che segue non è strettamente necessario, ma aiuta a fornirti la migliore esperienza utente, permettendoci di analizzare il comportamento degli utenti, identificare le funzionalità che usi di più, o non usi mai, capire i problemi dell'esperienza utente, ecc." + statistics_cookies_analytics_desc_html: "Per raccogliere e analizzare i dati di utilizzo della piattaforma, utilizziamo Google Analytics, in quanto era il servizio predefinito connesso a Spree (il software di e-commerce open source su cui abbiamo costruito), ma la nostra visione è passare a Matomo (ex Piwik, uno strumento di analisi open source che è conforme a GDPR e protegge la tua privacy) non appena possibile." + statistics_cookies_matomo_desc_html: "Per raccogliere e analizzare i dati di utilizzo della piattaforma, utilizziamo Matomo(ex Piwik), uno strumento di analisi open source che è conforme al GDPR e protegge la tua privacy." statistics_cookies_matomo_optout: "Vuoi rinunciare a Matomo analytics? Noi non raccogliamo nessun dato personale e Matomo ci aiuta a migliorare il nostro servizio, ma rispettiamo la tua scelta :-)" + cookie_analytics_utma_desc: "Utilizzato per distinguere utenti e sessioni. Il cookie viene creato quando viene eseguita la libreria javascript e non esistono cookie __utma. Il cookie viene aggiornato ogni volta che i dati vengono inviati a Google Analytics." + cookie_analytics_utmt_desc: "Utilizzato per limitare la velocità di richiesta." + cookie_analytics_utmb_desc: "Utilizzato per determinare nuove sessioni / visite. Il cookie viene creato quando viene eseguita la libreria javascript e non esistono cookie __utmb. Il cookie viene aggiornato ogni volta che i dati vengono inviati a Google Analytics." + cookie_analytics_utmc_desc: "Non utilizzato in ga.js. Impostato per l'interoperabilità con urchin.js. Storicamente, questo cookie operava in combinazione con il cookie __utmb per determinare se l'utente si trovava in una nuova sessione / visita." cookie_analytics_utmz_desc: "Memorizza la fonte di traffico o la campagna che spiega come l'utente ha raggiunto il tuo sito. Il cookie viene creato quando la libreria javascript viene eseguita e viene aggiornato ogni volta che i dati vengono inviati a Google Analytics." cookie_matomo_basics_desc: "Cookie di prima parte di Matomo per raccogliere statistiche." + cookie_matomo_heatmap_desc: "Matomo Heatmap e cookie di registrazione sessione." cookie_matomo_ignore_desc: "Cookie utilizzato per escludere l'utente dal tracciamento." disabling_cookies_header: "Avviso sulla disabilitazione dei cookie" disabling_cookies_desc: "Come utente puoi sempre consentire, bloccare o cancellare i cookie di Open Food Network o di qualsiasi altro sito web ogni volta che vuoi, attraverso il controllo delle impostazioni del tuo browser. Ogni browser ha un operativo diverso. Qui ci sono i link:" + disabling_cookies_firefox_link: "https://support.mozilla.org/en-US/kb/enable-and-disable-cookies-website-preferences" + disabling_cookies_chrome_link: "https://support.google.com/chrome/answer/95647" + disabling_cookies_ie_link: "https://support.microsoft.com/en-us/help/17442/windows-internet-explorer-delete-manage-cookies" + disabling_cookies_safari_link: "https://www.apple.com/legal/privacy/en-ww/cookies/" disabling_cookies_note: "Ma sappi che se cancelli o modifichi i cookie essenziali utilizzati da Open Food Network, il sito web non funzionerà, non potrai aggiungere nulla al carrello né alla cassa, ad esempio." cookies_banner: cookies_usage: "Questo sito utilizza i cookie per rendere la tua navigazione sicura e scorrevole, e per aiutarci a capire come lo usi per migliorare le caratteristiche che offriamo." cookies_definition: "I cookie sono file di testo molto piccoli che vengono memorizzati sul tuo computer quando visiti alcuni siti web." + cookies_desc: "Utilizziamo solo i cookie necessari per fornirti il servizio di vendita / acquisto di cibo online. Non vendiamo nessuno dei tuoi dati. Utilizziamo i cookie principalmente per ricordare chi sei se accedi al servizio o per ricordare gli articoli che hai inserito nel carrello anche se non hai effettuato l'accesso. Se continui a navigare sul sito web senza cliccare su \"Accetta i cookie\", assumiamo che tu ci stia dando il consenso a memorizzare i cookie che sono essenziali per il funzionamento del sito web." cookies_policy_link_desc: "Se vuoi saperne di più, controlla il nostro" cookies_policy_link: "cookies policy" cookies_accept_button: "Accetta Cookies" @@ -1406,6 +1460,8 @@ it: email_so_empty_explainer_html: "Purtroppo nessuno dei prodotti richiesti è disponibile, quindi nessuna gentile richiesta è stata confermata. Qui sotto le quantità originali richieste sono state barrate." email_so_empty_details_html: "Ecco i dettagli della gentile richiesta non confermata per %{distributor}:" email_so_failed_payment_intro_html: "Abbiamo cercato di elaborare un pagamento, ma abbiamo avuto qualche problema..." + email_so_failed_payment_explainer_html: "Errore nel pagamento del tuo abbonamento con %{distributor} a causa di un problema con la tua carta di credito. %{distributor} è stato avvisato dell'errore di pagamento." + email_so_failed_payment_details_html: "Ecco i dettagli dell'errore fornito dal gateway di pagamento:" email_shipping_delivery_details: Dettagli della consegna email_shipping_delivery_time: "Consegna il" email_shipping_delivery_address: "Indirizzo di consegna" @@ -1561,6 +1617,7 @@ it: products_available: Disponibile? products_producer: "Produttore" products_price: "Prezzo" + name_or_sku: "NOME O SKU" register_title: Registra sell_title: "Registrati" sell_headline: "Vieni su Open Food Network!" @@ -1618,6 +1675,7 @@ it: orders_bought_edit_button: Modifica gli articoli confermati orders_bought_already_confirmed: "* già confermato" orders_confirm_cancel: Sei sicura/o di voler annullare questa gentile richiesta? + order_processed_successfully: "Il tuo ordine è stato elaborato correttamente" products_cart_distributor_choice: "Distributore per il tuo ordine:" products_cart_distributor_change: "Il tuo distributore per questo ordine sarà sostituito da %{name} se aggiungi questo prodotto al tuo carrello." products_cart_distributor_is: "Il tuo distributore per quest'ordine è %{name}." @@ -1698,11 +1756,13 @@ it: registration_about_us: "Testo 'Su di noi'" registration_outcome_headline: "Cosa ottengo?" registration_outcome1_html: "Il tuo profilo aiuta la persone a trovarti e contattarti su Open Food Network." + registration_outcome2: "Usa questo spazio per raccontare la storia della tua impresa, per aiutare gli utenti a connettersi con te sui social e online." registration_outcome3: "E' anche il primo passo verso la vendita su Open Food Network, o l'apertura di un negozio online." registration_action: "Cominciamo!" details: title: "Dettagli" headline: "Iniziamo!" + enterprise: "Wow! Innanzitutto abbiamo bisogno di sapere qualcosa della tua impresa:" producer: "Bene! Innanzitutto abbiamo bisogno di sapere qualcosa in più sulla tua azienda:" enterprise_name_field: "Nome Azienda:" producer_name_field: "Nome Azienda:" @@ -1744,6 +1804,8 @@ it: title: "Descrizione" headline: "Bello!" message: "Adesso completiamo i dettagli su" + success: "Bene! %{enterprise} aggiunto a Open Food Network" + registration_exit_message: "Se esci da questa procedura guidata in qualsiasi momento, puoi continuare a creare il tuo profilo dall'interfaccia diell'amministrazione." enterprise_description: "Breve descrizione" enterprise_description_placeholder: "Una frase corta che descriva la tua azienda" enterprise_long_desc: "Descrizione lunga" @@ -1838,6 +1900,10 @@ it: ok: OK not_visible: non visibile you_have_no_orders_yet: "Non hai ordini al momento" + show_only_complete_orders: "Mostra solo le richieste complete" + successfully_created: '%{resource} è stato creato con successo!' + successfully_removed: '%{resource} è stato rimosso con successo!' + successfully_updated: '%{resource} è stato aggiornato con successo!' running_balance: "Bilancio corrente" outstanding_balance: "Insoluto" admin_enterprise_relationships: "Permessi Azienda" @@ -2137,6 +2203,8 @@ it: report_header_total_taxable_fees: Totale provvigioni tassabili (incl. tasse) report_header_delivery_shipping_cost: Costi di spedizione/consegna (incl. tasse) report_header_transaction_fee: Commissioni di transazione (no tasse) + report_header_total_untaxable_admin: Aggiustamenti amministrativi totali non tassabili (nessuna imposta) + report_header_total_taxable_admin: Totale rettifiche amministrative tassabili (tasse incluse) initial_invoice_number: "Numero di fattura iniziale:" invoice_date: "Data fattura:" due_date: "Scadenza:" @@ -2171,6 +2239,8 @@ it: shipping_methods: "Metodi di Spedizione" payment_methods: "Metodi di pagamento" payment_method_fee: "Imposta di transizione" + payment_processing_failed: "Non è stato possibile elaborare il pagamento, per favore controlla i dettagli che hai inserito" + payment_updated: "Pagamento aggiornato" inventory_settings: "Impostazioni dell'inventario" tag_rules: "Regole dei tag" shop_preferences: "Preferenze di acquisto" @@ -2285,6 +2355,10 @@ it: La tua azienda è la spina dorsale del vostro sistema alimentare locale. Puoi aggregare i prodotti di altre aziende e venderli attraverso il tuo negozio su Open Food Network. + hub_shop_text2: > + Gli hub possono assumere molte forme: possono essere una cooperativa + alimentare, un gruppo di acquisto, una csa o un negozio di alimentari + locale. hub_shop_text3: > Se desideri anche vendere i tuoi prodotti, è necessario che la tua azienda diventi un produttore. @@ -2304,8 +2378,28 @@ it: Se preferisci concentrarti sulla produzione di cibo e vuoi lasciare il lavoro di venderlo a qualcun altro, non avrai bisogno di un negozio su Open Food Network. + profile_only_text3: > + Aggiungi i tuoi prodotti a Open Food Network, consentendo agli hub di + immagazzinare i tuoi prodotti nei loro negozi. producer_shop: Negozio produttore + producer_shop_text1: > + Vendi i tuoi prodotti direttamente ai clienti attraverso la tua vetrina + su Open Food Network. + producer_shop_text2: > + Un Negozio Produttore è solo per i tuoi prodotti: se vuoi vendere prodotti + coltivati / prodotti al di fuori della tua azienda, seleziona "Hub Produttore". producer_hub: Hub produttore + producer_hub_text1: > + La tua azienda è la spina dorsale del tuo sistema alimentare locale. + Puoi vendere i tuoi prodotti e anche aggiungere prodotti di altre imprese + attraverso il tuo negozio su Open Food Network + producer_hub_text2: > + Gli Hub dei produttori possono assumere molte forme: CSA, cooperative + alimentari, produttori che compongono cassette.. . + producer_hub_text3: > + Open Food Network mira a supportare quanti più modelli di hub possibile, + quindi, indipendentemente dalla tua situazione, vogliamo fornire gli + strumenti necessari per gestire la tua organizzazione alimentare locale. get_listing: Ottieni un listino always_free: SEMPRE LIBERO sell_produce_others: Vendi prodotti di altri @@ -2370,6 +2464,7 @@ it: pending: "in sospeso" ready: "pronto" shipped: "spedito" + canceled: "annullato" payment_states: balance_due: "saldo" completed: "completato" @@ -2386,6 +2481,7 @@ it: sending: "Invia di nuovo..." done: "Reinvio fatto ✓" failed: "Re-invio fallito ✗" + insufficient_stock: "Scorte disponibili insufficienti, solo %{on_hand} rimanenti" out_of_stock: reduced_stock_available: Quantità disponibile ridotta out_of_stock_text: > @@ -2412,6 +2508,7 @@ it: no_changes_to_save: Nessuna modifica da salvare. no_authorisation: "Non abbiamo l'autorizzazione per salvare queste modifiche. " some_trouble: "Abbiamo avuto problemi durante il salvataggio: %{errors}" + changing_on_hand_stock: Modifica a mano i livelli delle scorte ... stock_reset: Quantità resettate alle predefinite. tag_rules: show_hide_variants: 'Mostra o nascondi varianti nella mia vetrina' @@ -2430,6 +2527,10 @@ it: add_products_to_inventory: "aggiungi prodotti all'inventario" resources: could_not_delete_customer: 'Non è possibile annullare utente' + product_import: + confirmation: | + Questo imposterà il livello delle scorte a zero su tutti i prodotti per questa + impresa che non sono presenti nel file caricato. order_cycles: create_failure: "Impossibile creare il ciclo dell'ordine" update_success: 'Il tuo ciclo di richieste è stato aggiornato' @@ -2459,65 +2560,209 @@ it: order_management: reports: enterprise_fee_summary: + date_end_before_start_error: "deve essere dopo l'inizio" + parameter_not_allowed_error: "Non sei autorizzato a utilizzare uno o più filtri selezionati per questo rapporto." fee_calculated_on_transfer_through_all: "Tutti" + fee_calculated_on_transfer_through_entire_orders: "Intero ordine tramite %{distributor}" + tax_category_various: "vario" + fee_type: + payment_method: "Transazione di pagamento" + shipping_method: "Spedizione" fee_placements: supplier: "In arrivo" distributor: "In uscita" coordinator: "Referente" + tax_category_name: + shipping_instance_rate: "Tariffa della piattaforma" formats: csv: header: fee_type: "Tipo di tariffa" + enterprise_name: "Proprietario dell'azienda" + fee_name: "Nome della tariffa" customer_name: "Consumatore" + fee_placement: "Posizionamento della tariffa" + fee_calculated_on_transfer_through_name: "Calcolo della commissione sul trasferimento tramite" tax_category_name: "Categoria d'imposta" + total_amount: "€€ SOMMA" html: header: fee_type: "Tipo di tariffa" + enterprise_name: "Proprietario dell'azienda" + fee_name: "Nome della tariffa" customer_name: "Consumatore" + fee_placement: "Posizionamento della tariffa" + fee_calculated_on_transfer_through_name: "Calcolo della commissione sul trasferimento tramite" tax_category_name: "Categoria d'imposta" + total_amount: "€€ SOMMA" + invalid_filter_parameters: "I filtri che hai selezionato per questo report non sono validi" order: "Gentile Richiesta" distribution: "Distribuzione" + order_details: "Dettagli ordine" + customer_details: "Dettagli cliente" + adjustments: "Regolazioni" + payments: "Pagamenti" payment: "Pagamento" payment_method: "Metodo di pagamento" + shipment: "Spedizione" + shipment_inc_vat: "Spedizione inclusa IVA" + shipping_tax_rate: "Tariffa spedizione" category: "Categoria" delivery: "Consegna" + temperature_controlled: "Temperatura controllata" new_product: "Nuovo prodotto" administration: "Amministrazione" + logged_in_as: "Collegato come" account: "Account" logout: "Logout" + date_range: "Intervallo di date" + status: "stato" + new: "Nuovo" + start: "Inizio" + stop: "Stop" first: "Primo" previous: "Precedente" last: "Ultimo" spree: + your_order_is_empty_add_product: "Il tuo ordine è vuoto, cerca e aggiungi un prodotto qui sopra" + add_product: "Aggiungi prodotto" + name_or_sku: "Nome o SKU (inserisci almeno i primi 4 caratteri del nome del prodotto)" resend: Invia di nuovo + back_to_orders_list: Torna alla lista delle richieste + select_stock: "Seleziona magazzino" + location: "Posizione" + count_on_hand: "Conta a mente" quantity: "Quantità" + package_from: "pacchetto da" + item_description: "descrizione dell'articolo" price: "Prezzo" total: "Totale" edit: "Modifica" + split: "Diviso" delete: "Annulla" + cannot_set_shipping_method_without_address: "Impossibile impostare il metodo di spedizione finché non vengono forniti i dettagli del cliente." + no_tracking_present: "Nessun dettaglio di tracciamento fornito." + order_total: "Ordine totale" + customer_details: "Dettagli cliente" + customer_search: "Ricerca clienti" + choose_a_customer: "Scegli un cliente" account: "Account" billing_address: "Indirizzo di fatturazione" shipping_address: "Indirizzo di consegna" + first_name: "Nome" + last_name: "Cognome" + street_address: "Indirizzo" + street_address_2: "Indirizzo (seguito)" city: "Comune" + zip: "CAP" country: "Stato" state: "Stato" phone: "Telefono" update: "Aggiorna" + use_billing_address: "Utilizzare l'indirizzo di fatturazione" + adjustments: "Regolazioni" continue: "Continua" + fill_in_customer_info: "Si prega di compilare le informazioni del cliente" + new_payment: "Nuovo pagamento" + configurations: "Configurazioni" general_settings: "Impostazioni generali" + site_name: "Nome del sito" + site_url: "URL del sito" + default_seo_title: "Titolo Seo predefinito" + default_meta_description: "Meta Descrizione predefinita" + default_meta_keywords: "Parole chiave Meta predefinite" + security_settings: "Impostazioni di sicurezza" + allow_ssl_in_development_and_test: "Consentire l'utilizzo di SSL nelle modalità di sviluppo e test" + allow_ssl_in_production: "Consentire l'utilizzo di SSL in modalità produzione" + allow_ssl_in_staging: "Consentire l'utilizzo di SSL nella modalità di gestione temporanea" + check_for_spree_alerts: "Controlla gli avvisi Spree" + currency_decimal_mark: "Valuta decimale" + currency_settings: "Impostazioni valuta" + currency_symbol_position: Metti "simbolo di valuta prima o dopo l'importo?" + currency_thousands_separator: "Separatore di valuta in migliaia" + hide_cents: "Nascondi centesimi" + display_currency: "Visualizza valuta" + choose_currency: "Scegli Valuta" + mail_method_settings: "Impostazioni del metodo di posta" + general: "Generale" + enable_mail_delivery: "Abilita recapito posta" + send_mails_as: "Invia mail come" + smtp_send_all_emails_as_from_following_address: "Invia tutte le email come dal seguente indirizzo." + send_copy_of_all_mails_to: "Invia copia di tutti i messaggi a" + smtp_send_copy_to_this_addresses: "Invia una copia di tutti i messaggi in uscita a questo indirizzo. Per più indirizzi, separare con virgole." + intercept_email_address: "Intercettare l'indirizzo email" + intercept_email_instructions: "Sostituire il destinatario della posta elettronica con questo indirizzo." + smtp: "SMTP" + smtp_domain: "Dominio SMTP" + smtp_mail_host: "Host di posta SMTP" + smtp_port: "Porta SMTP" + secure_connection_type: "Tipo di connessione sicura" + smtp_authentication_type: "Tipo di autenticazione SMTP" + smtp_username: "Nome utente SMTP" + smtp_password: "Password SMTP" + image_settings: "Impostazioni immagine" + image_settings_warning: "Avrai bisogno di rigenerare le miniature se aggiorni gli stili di graffetta. Usa rake paperclip: refresh: miniature CLASS = Spree :: Immagine per farlo." + attachment_default_style: Stile allegati + attachment_default_url: "Allegati URL predefinito" + attachment_path: "Percorso degli allegati" + attachment_styles: "Stili di graffetta" + attachment_url: "URL allegati" + add_new_style: "Aggiungi nuovo stile" + image_settings_updated: "Impostazioni immagine aggiornate con successo." tax_categories: "Categorie imposte" + listing_tax_categories: "Elenco delle categorie fiscali" + back_to_tax_categories_list: "Torna all'elenco delle categorie fiscali" tax rate: "Aliquote d'imposta" + new_tax_rate: "Nuova tariffa" tax_category: "Categoria d'imposta" + rate: "Tariffa" + tax_rate_amount_explanation: "Le tariffe sono un importo decimale da utilizzare nei calcoli (ad esempio, se l'aliquota fiscale è del 5%, inserire 0,05)" + included_in_price: "Incluso nel prezzo" + show_rate_in_label: "Mostra tariffa in etichetta" + back_to_tax_rates_list: "Torna all'elenco delle tariffe" tax_settings: "Impostazione contributi" + zones: "Zone" + new_zone: "Nuova zona" + default_tax: "Imposta predefinita" + default_tax_zone: "Zona fiscale predefinita" + country_based: "Basato sul paese" + state_based: "Basato sullo stato" + countries: "Paesi" + listing_countries: "Elenco dei paesi" + iso_name: "Nome ISO" + states_required: "Stati richiesti" + editing_country: "Modifica Paese" + back_to_countries_list: "Torna all'elenco dei Paesi" + states: "Stati" + abbreviation: "Abbreviazione" + new_state: "Nuovo stato" payment_methods: "Metodi di pagamento" new_payment_method: "Nuovo metodo di pagamento" + provider: "Provider" + taxonomies: "Tassonomie" + new_taxonomy: "Nuova tassonomia" + back_to_taxonomies_list: "Torna all'elenco delle tassonomie" shipping_methods: "Metodi di spedizione" shipping_categories: "Categorie Spedizioni" + new_shipping_category: "Nuova categoria di spedizione" + back_to_shipping_categories: "Torna alle categorie di spedizione" + analytics_trackers: "Tracker di Analytics" + no_trackers_found: "Nessun tracker trovato" + new_tracker: "Nuovo tracker" + add_one: "Aggiungi uno" + google_analytics_id: "ID Analytics" + back_to_trackers_list: "Torna all'elenco dei tracker" name: "Nome" description: "Descrizione" type: "Tipo" + default: "predefinito" calculator: "Calcolatrice" + zone: "Zone" + display: "Visualizza" + environment: "Ambiente" + active: "Attivo" nore: "Di più" + no_results: "Nessun risultato" create: "Crea" loading: "Caricamento" email: Email @@ -2525,6 +2770,7 @@ it: my_account: "Il mio account" date: "Data" time: "Ora" + inventory_error_flash_for_insufficient_quantity: "Un articolo nel tuo carrello è diventato non disponibile." inventory: Inventario zipcode: CAP weight: Peso (kg) @@ -2533,6 +2779,10 @@ it: errors: messages: blank: "non può essere lasciato vuoto" + layouts: + admin: + header: + store: Memorizzare admin: tab: dashboard: "Pannello di controllo" @@ -2540,15 +2790,22 @@ it: bulk_order_management: "Gestione richieste all'ingrosso" subscriptions: "Abbonamenti" products: "Prodotti" + option_types: "Tipi di opzioni" properties: "Proprietà" + prototypes: "prototipi" variant_overrides: "Inventario" reports: "Resoconti" + configuration: "Configurazione" users: "Utenti" roles: "Ruoli" order_cycles: "Cicli di richiesteCicli di richieste" enterprises: "Aziende" + enterprise_relationships: "permessi" customers: "Consumatori" groups: "Gruppi" + product_properties: + index: + inherits_properties_checkbox_hint: "Eredita le proprietà da %{supplier}? (se non sovrascritto)" orders: index: listing_orders: "Listino Ordini" @@ -2584,10 +2841,14 @@ it: title: "Distribuzione" distributor: "Distributore:" order_cycle: "Ciclo di richieste:" + line_item_adjustments: "Rettifiche articolo" + order_adjustments: "Modifiche richieste" + order_total: "Ordine totale" overview: products: active_products: zero: "Non hai prodotti attivi." + one: "Hai un prodotto attivo" other: "Hai il %{count} di prodotti disponibili" order_cycles: order_cycles: "Cicli di richiesteCicli di richieste" @@ -2627,6 +2888,8 @@ it: title: 'Nuovo prodotto' unit_name_placeholder: 'es. grappoli' index: + header: + title: Modifica prodotti tabella indicators: title: CARICAMENTO PRODOTTI no_products: "Non ci sono ancora prodotti. Perché non ne aggiungi qualcuno?" @@ -2649,14 +2912,25 @@ it: product_category: Categoria prodotto group_buy_form: group_buy: "Acquisto di gruppo?" + bulk_unit_size: Dimensione unità - tabella display_as: display_as: Visualizza come reports: table: select_and_search: "Seleziona filtri e clicca su %{option} per accedere al tuo dato" + bulk_coop: + bulk_coop_supplier_report: 'Totali per fornitore - tabella' + bulk_coop_allocation: 'Assegnazione - tabella' + bulk_coop_packing_sheets: 'Imballaggio - tabella' + bulk_coop_customer_payments: 'Pagamenti clienti - tabella' enterprise_fee_summaries: + filters: + date_range: "Intervallo di date" + report_format_csv: "Scarica come CSV" + generate_report: "Genera report" report: none: "Nessuno" + select_and_search: "Seleziona i filtri e fai clic su GENERA REPORT per accedere ai tuoi dati." users: index: listing_users: "Elenco Utenti" @@ -2705,6 +2979,9 @@ it: login_to_view_order: "Effettua il login per visualizzare il tuo ordine." bought: item: "Già richiesto in questo ciclo di richieste" + line_item: + insufficient_stock: "Scorte disponibili insufficienti, solo %{on_hand} rimanenti" + out_of_stock: "Esaurito" shipment_states: backorder: ordine arretrato partial: parziale @@ -2797,6 +3074,8 @@ it: delete?: Elimina? cards: authorised_shops: Negozi autorizzati + authorised_shops_popover: Questa è la lista di negozi a cui è consentito addebitare sulla carta di credito predefinita qualsiasi abbonamento (ad esempio, ordini ripetuti) che potresti avere. I dati della tua carta saranno protetti e non saranno condivisi con i proprietari dei negozi. Sarai sempre avvisato quando ti verranno addebitati. + saved_cards_popover: Questa è la lista di carte che hai scelto di salvare per un uso successivo. Il tuo 'predefinito' sarà selezionato automaticamente quando esegui il checkout di un ordine, e può essere addebitato da qualsiasi negozio che hai autorizzato a farlo (vedi a destra). authorised_shops: shop_name: "Nome del negozio" allow_charges?: "Consentire ricarichi" From 860414fa31d8b4d03e1af17b1eee3dff85ad50c6 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Mon, 8 Apr 2019 12:27:19 +0200 Subject: [PATCH 13/29] Update locales with latest Transifex translations --- config/locales/ca.yml | 1 + config/locales/de_DE.yml | 3 + config/locales/en_BE.yml | 3 + config/locales/en_CA.yml | 22 +++--- config/locales/en_GB.yml | 4 ++ config/locales/es.yml | 1 + config/locales/fr_BE.yml | 143 +++++++++++++++++++++++++++++++++++++-- config/locales/fr_CA.yml | 4 ++ config/locales/nb.yml | 4 ++ config/locales/nl_BE.yml | 139 ++++++++++++++++++++++++++++++++++++- config/locales/pt.yml | 1 + config/locales/sv.yml | 2 + 12 files changed, 313 insertions(+), 14 deletions(-) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d945250c6c..8825827c56 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -2841,6 +2841,7 @@ ca: title: "Distribució" distributor: "Distribuïdora:" order_cycle: "Cicle de comanda:" + order_total: "Total comanda" overview: products: active_products: diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml index 6f25d908ee..077e10a65a 100644 --- a/config/locales/de_DE.yml +++ b/config/locales/de_DE.yml @@ -859,6 +859,8 @@ de_DE: welcome_text: 'Erfolgreich erstellt:' next_step: Nächster Schritt choose_starting_point: 'Wählen Sie Ihr Paket:' + profile: 'Profil' + producer_profile: 'Erzeuger Profil' invite_manager: user_already_exists: "Benutzer existiert bereits" error: "Etwas ist schief gelaufen" @@ -2462,6 +2464,7 @@ de_DE: pending: "steht aus" ready: "fertig" shipped: "versendet" + canceled: "abgebrochen" payment_states: balance_due: "Betrag offen" completed: "fertig gestellt" diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml index 1eb70fdf92..5b4a5cacd5 100644 --- a/config/locales/en_BE.yml +++ b/config/locales/en_BE.yml @@ -833,6 +833,8 @@ en_BE: welcome_text: You have successfully created a next_step: Next step choose_starting_point: 'Choose your package:' + profile: 'Profile' + producer_profile: 'Producer Profile' invite_manager: user_already_exists: "User already exists" error: "Something went wrong" @@ -2413,6 +2415,7 @@ en_BE: pending: "pending" ready: "ready" shipped: "shipped" + canceled: "cancelled" payment_states: balance_due: "balance due" completed: "completed" diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml index a80f3c254e..0aa4e7d684 100644 --- a/config/locales/en_CA.yml +++ b/config/locales/en_CA.yml @@ -41,7 +41,7 @@ en_CA: producer_ids: "Producers" order_cycle_ids: "Order Cycles" enterprise_fee_ids: "Names for Fees" - shipping_method_ids: "Delivery/Pick-up Methods" + shipping_method_ids: "Shipping Methods" payment_method_ids: "Payment Methods" errors: models: @@ -638,10 +638,10 @@ en_CA: desc_long: About Us desc_long_placeholder: Tell customers about yourself. This information appears on your public profile. business_details: - abn: Business number if available - abn_placeholder: Number will show on invoices - acn: Business Number - acn_placeholder: eg. 123 456 789 + abn: Business Number + abn_placeholder: eg. 80781 2466 + acn: Busines Number + acn_placeholder: eg.80781 2466 display_invoice_logo: Display logo in invoices invoice_text: Add customized text at the end of invoices contact: @@ -857,6 +857,8 @@ en_CA: welcome_text: You have successfully created a next_step: Next step choose_starting_point: 'Choose your package:' + profile: 'Profile' + producer_profile: 'Producer Profile' invite_manager: user_already_exists: "User already exists" error: "Something went wrong" @@ -929,7 +931,7 @@ en_CA: ready_for: Ready for ready_for_placeholder: Date / time customer_instructions: Customer instructions - customer_instructions_placeholder: Pick-up or delivery notes + customer_instructions_placeholder: 'Notes:' products: Products fees: Fees destroy_errors: @@ -1225,7 +1227,7 @@ en_CA: city_placeholder: eg. Northcote postcode: Postal Code postcode_placeholder: eg. 3070 - state: State + state: Province country: Country unauthorized: Unauthorized terms_of_service: "Terms of service" @@ -2457,6 +2459,7 @@ en_CA: pending: "pending" ready: "ready" shipped: "shipped" + canceled: "cancelled" payment_states: balance_due: "balance due" completed: "completed" @@ -2648,7 +2651,7 @@ en_CA: city: "City" zip: "Postal Code" country: "Country" - state: "Province" + state: "State" phone: "Phone" update: "Update" use_billing_address: "Use Billing Address" @@ -2820,7 +2823,7 @@ en_CA: shipment_state: "Shipment State" completed_at: "Completed At" number: "Number" - state: "Province" + state: "State" email: "Customer E-Mail" invoice: issued_on: "Issued on" @@ -2833,6 +2836,7 @@ en_CA: title: "Distribution" distributor: "Distributor:" order_cycle: "Order cycle:" + order_total: "Order Total" overview: products: active_products: diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index abda664874..06177a0bc0 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -857,6 +857,8 @@ en_GB: welcome_text: You have successfully created a next_step: Next step choose_starting_point: 'Choose your package:' + profile: 'Profile' + producer_profile: 'Producer Profile' invite_manager: user_already_exists: "User already exists" error: "Something went wrong" @@ -2463,6 +2465,7 @@ en_GB: pending: "pending" ready: "ready" shipped: "shipped" + canceled: "cancelled" payment_states: balance_due: "balance due" completed: "completed" @@ -2839,6 +2842,7 @@ en_GB: title: "Distribution" distributor: "Distributor:" order_cycle: "Order cycle:" + order_total: "Order Total" overview: products: active_products: diff --git a/config/locales/es.yml b/config/locales/es.yml index 69fff959cb..17ba43eb59 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2842,6 +2842,7 @@ es: title: "Distribución" distributor: "Distribuidora:" order_cycle: "Ciclo de pedido:" + order_total: "Total del pedido" overview: products: active_products: diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml index 5bb9ac0e6b..f471a9c2f1 100644 --- a/config/locales/fr_BE.yml +++ b/config/locales/fr_BE.yml @@ -40,6 +40,7 @@ fr_BE: distributor_ids: "Comptoirs" producer_ids: "Producteurs" order_cycle_ids: "Cycles de vente" + enterprise_fee_ids: "Nom des commissions " shipping_method_ids: "Méthodes de livraison" payment_method_ids: "Méthodes de paiement" errors: @@ -85,6 +86,12 @@ fr_BE: models: order_cycle: cloned_order_cycle_name: "Copie de %{order_cycle}" + validators: + date_time_string_validator: + invalid_format_error: "doit être valide " + integer_array_validator: + not_array_error: "doit être un array" + invalid_element_error: "doit contenir uniquement des nombres entiers" enterprise_mailer: confirmation_instructions: subject: "Confirmez l'adresse email pour %{enterprise}" @@ -212,6 +219,7 @@ fr_BE: admin_and_handling: Frais si par commande profile: Profil supplier_only: Uniquement Producteur + has_shopfront: 'A une vitrine ' weight: Poids volume: Volume items: Pièces @@ -233,6 +241,7 @@ fr_BE: quantity: Quantité pick_up: Retrait copy: Copier + change_my_password: "Changer mon mot de passe" update_password: "Mise à jour du mot de passe" password_confirmation: confirmation du mot de passe reset_password_token: réinitialisation du mot de passe @@ -363,6 +372,7 @@ fr_BE: status: "Statut" diff: "Diff" error: "Erreur" + enable_products_cache: "Permettre des produits en approvisionnement? " invoice_settings: edit: title: Paramètres de facturation @@ -627,7 +637,7 @@ fr_BE: desc_long: A propos de nous desc_long_placeholder: Parlez de vous à vos acheteurs ! Ces informations seront visibles sur votre profil public. business_details: - abn: SIRET + abn: Numéro d'entreprise abn_placeholder: 'ex: 404 833 048 00022' acn: n° TVA intracommunautaire acn_placeholder: 'ex: 404 833 048' @@ -847,6 +857,8 @@ fr_BE: welcome_text: 'Vous avez créé avec succès ' next_step: Etape suivante choose_starting_point: 'Choisir votre type d''entreprise:' + profile: 'Profil' + producer_profile: 'Profil producteur' invite_manager: user_already_exists: "Le compte existe déjà" error: "Un problème est survenu" @@ -1006,6 +1018,9 @@ fr_BE: description: Factures pour import dans Xero packing: name: Rapports de préparation des paniers + enterprise_fee_summary: + name: "Récapitulatif de la commission d'entreprise " + description: "Récapitulatif des commissions d'entreprise perçues" subscriptions: subscriptions: Abonnements new: Nouvel abonnement @@ -1160,7 +1175,7 @@ fr_BE: tax_total: "Total taxe (%{rate}) :" total_excl_tax: "Total HT :" total_incl_tax: "Total TTC :" - abn: "SIRET" + abn: "Numéro d'entreprise : " acn: "n° TVA intracommunautaire" invoice_issued_on: "Date de facture :" order_number: "N° de facture :" @@ -1224,6 +1239,7 @@ fr_BE: no_shipping_or_payment: pas de méthode de livraison ou de paiement unconfirmed: non confirmé days: jours + authorization_failure: "Echec autorisation " label_shop: "Comptoir" label_shops: "Comptoirs" label_map: "Carte" @@ -1599,6 +1615,7 @@ fr_BE: products_available: Disponible? products_producer: "Producteur" products_price: "Prix" + name_or_sku: "NOM OU NUMÉRO D'ARTICLE " register_title: S'inscrire sell_title: "S'inscrire" sell_headline: "Rejoignez l'Open Food Network !" @@ -1743,6 +1760,7 @@ fr_BE: details: title: "Informations" headline: "Commençons" + enterprise: "Bien! D'abord quelques mots sur votre entreprise" producer: "Woohoo! Dites-nous déjà quelques mots à propos de votre ferme:" enterprise_name_field: "Nom de l'entreprise :" producer_name_field: "Nom de la ferme:" @@ -1791,7 +1809,7 @@ fr_BE: enterprise_long_desc: "Description longue" enterprise_long_desc_placeholder: "Vous pouvez ici raconter l'histoire de votre organisation - votre projet, les valeurs que vous défendez. Nous vous conseillons de ne pas dépasser 600 caractères ou 150 mots." enterprise_long_desc_length: "%{num} caractères / inférieur à 600 recommandé" - enterprise_abn: "SIRET" + enterprise_abn: "Numéro d'entreprise " enterprise_abn_placeholder: "ex: 404 833 048 00022" enterprise_acn: "n° TVA intracommunautaire" enterprise_acn_placeholder: "ex: 404 833 048" @@ -2453,6 +2471,7 @@ fr_BE: pending: "en attente" ready: "prêt" shipped: "envoyé" + canceled: "annulé" payment_states: balance_due: "solde dû" completed: "effectué" @@ -2483,6 +2502,7 @@ fr_BE: 'yes': "A volonté" variant_overrides: on_demand: + use_producer_settings: "Utiliser les stocks producteur " 'yes': "Oui" 'no': "Non" inventory_products: "Produits du Catalogue Boutique" @@ -2548,8 +2568,11 @@ fr_BE: order_management: reports: enterprise_fee_summary: + date_end_before_start_error: "Doit être après le départ" + parameter_not_allowed_error: "Vous n'êtes pas autorisé à employer un ou plusieurs filtres de ce rapport." fee_calculated_on_transfer_through_all: "Tous" fee_calculated_on_transfer_through_entire_orders: "Commandes complétées par %{distributor}" + tax_category_various: "Autres" fee_type: payment_method: "Transaction de paiement" shipping_method: "Envoi" @@ -2557,76 +2580,176 @@ fr_BE: supplier: "Produits entrants (pouvant être mis en vente par les hubs)" distributor: "Produits sortants (mis en vente par/via un ou plusieurs hubs)" coordinator: "Coordinateur" + tax_category_name: + shipping_instance_rate: "Taux de commission de la plateforme " formats: csv: header: fee_type: "Type de marge" enterprise_name: "Bedrijfsbeheerder" + fee_name: "Nom de la commission " customer_name: "Acheteur" + fee_placement: "Emplacement commission" + fee_calculated_on_transfer_through_name: "Calcul de la commission sur cession par" tax_category_name: "TVA applicable" html: header: fee_type: "Type de marge" enterprise_name: "Bedrijfsbeheerder" + fee_name: "Nom de la commission " customer_name: "Acheteur" + fee_placement: "Emplacement commission" + fee_calculated_on_transfer_through_name: "Calcul de la commission sur cession par" tax_category_name: "TVA applicable" + invalid_filter_parameters: "Les filtres sélectionnés pour ce rapport ne sont pas valides." order: "Commandes à venir" distribution: "Distribution" + order_details: "Données de la commande " + customer_details: "Données client" + adjustments: "Corrections" payments: "Paiements" payment: "Paiement" payment_method: "Méthode de paiement" - shipment: "Verzending" + shipment: "Envoi" + shipment_inc_vat: "Expédition TVA incluse " + shipping_tax_rate: "TVA applicable pour l'expédition " category: "Catégorie" delivery: "Livraison" + temperature_controlled: "Tempéré" new_product: "Nouveau Produit" administration: "Administration" + logged_in_as: "Saisi comme " account: "Compte" logout: "Déconnexion" + date_range: "Plage de dates" status: "statut" new: "Nouveau" start: "Début" + stop: "Arrêter" first: "Début" previous: "Précédent" last: "Fin" spree: your_order_is_empty_add_product: "Votre commande est vide, merci de chercher et d'ajouter un des produits ci-dessus" add_product: "Ajoutez un produit" + name_or_sku: "Nom ou N° d'article (entrer au moins 4 lettres du nom du produit) " resend: Renvoyer + back_to_orders_list: 'Retour vers la liste des commandes ' + select_stock: "Selectionner stock" + location: "Site" quantity: "Nb commandé" + package_from: "colis provenant de " + item_description: "Description de l'article " price: "Prix" total: "Total" edit: "Modifier" + split: "Scinder" delete: "Supprimer" + cannot_set_shipping_method_without_address: "Impossible d'indiquer le mode d'expédition avant de compléter les données client" + no_tracking_present: "Pas de traçage des données fournies." order_total: "Total commande " + customer_details: "Données client" + customer_search: "Recherche client" + choose_a_customer: "Choisir un client" account: "Compte" billing_address: "Adresse de facturation" shipping_address: "Adresse de livraison" first_name: "Prénom" last_name: "Nom de famille" + street_address: "Nom de la rue " + street_address_2: "Nom de la rue (suite)" city: "Ville" + zip: "Zip" country: "Pays" state: "Province" phone: "Téléphone" update: "Mettre à jour" + use_billing_address: "Utiliser l'adresse de facturation" + adjustments: "Corrections" continue: "Suivant" + fill_in_customer_info: "Merci de remplir les informations client" new_payment: "Nouveau paiement" + configurations: "Configurations" general_settings: "Réglages Généraux" + default_seo_title: "Titre SEO par défaut" + default_meta_description: "Meta Description par défaut" + default_meta_keywords: "Meta Mots-clés par défaut" + security_settings: "Paramètres de sécurité " + allow_ssl_in_development_and_test: "Autoriser l’utilisation de SSL pendant le développement et les modes test" + allow_ssl_in_production: "Autoriser SSL en mode production " + allow_ssl_in_staging: "Autoriser SSL quand est employé en mode visible " + check_for_spree_alerts: "Attention aux alertes en série " + currency_decimal_mark: "Devise à la décimale " + currency_settings: "Devise " + currency_thousands_separator: "Devise avec séparateur de mille" + display_currency: "Afficher devise " + choose_currency: "Choisir devise " + mail_method_settings: "Paramètres du moyen mail" + enable_mail_delivery: "Possible de livrer le mail" + send_mails_as: "Envoyer les mails comme " + smtp_send_all_emails_as_from_following_address: "Envoyer tous les mails comme de l'adresse suivante." send_copy_of_all_mails_to: "Envoyez une copie de tous les mails à " + smtp_send_copy_to_this_addresses: "Envoit une copie de tous les mails sortants vers cette adresse. En cas de plusieurs adresses, séparer par une virgule." + intercept_email_address: "Intercepter les adresses mail" + intercept_email_instructions: "Ignorer le destinataire et le remplacer par cette adresse." + smtp: "SMTP" + smtp_domain: "Domaine SMPT" + smtp_mail_host: "SMPT Serveur mail" + smtp_username: " SMPT Nom d’utilisateur " + smtp_password: "SMPT Mot de passe" + image_settings: "Paramètres image" + image_settings_warning: "Il est nécessaire de régénérer des logos lors de la mise à jour des styles de trombones . Utiliser ratisser trombone:rafraîchir:logos CLASS=Spree::Image pour faire ceci. " + attachment_default_style: Style Pièces jointes + attachment_default_url: "Joint à URL par défaut" + attachment_styles: "Styles trombones" + add_new_style: "Ajouter un nouveau style " + image_settings_updated: "Paramètres Image mis à jour avec succès." tax_categories: "TVA applicable" + listing_tax_categories: "Liste catégories TVA" + back_to_tax_categories_list: "Retour à la liste des catégories de TVA" tax rate: "Par taux de taxe" + new_tax_rate: "Nouveau taux de TVA" tax_category: "TVA applicable" + rate: "Taux " + tax_rate_amount_explanation: "Les taux sont décimaux pour faciliter les calculs (par ex. un taux de 5% sera entré en tant que 0.05) " included_in_price: "Inclus dans le prix " + show_rate_in_label: "Montrer le taux sur l'étiquette " + back_to_tax_rates_list: "Retour à la liste des taux de TVA" tax_settings: "Paramètres TVA" + zones: "Zones" + new_zone: "Nouvelle zone " + default_tax: "TVA par défaut" + default_tax_zone: "Zone TVA par défaut" + iso_name: "Nom ISO" + back_to_countries_list: "Retouner vers la liste des pays" + abbreviation: "Abréviation" payment_methods: "Méthodes de paiement" new_payment_method: "Nouvelle méthode de paiement" + provider: "Fournisseur" + taxonomies: "Taxonomies " + new_taxonomy: "Nouvelle taxonomie" + back_to_taxonomies_list: "Retour à la liste des taxonomies" shipping_methods: "Méthodes de livraison" shipping_categories: "Condition de transport" + new_shipping_category: "Nouvelle catégorie d'expédition " + back_to_shipping_categories: "Retour vers les catégories d'expédition" + analytics_trackers: "Analyse trackers" + no_trackers_found: "Aucun tracker trouvé" + new_tracker: "Nouveau tracker" add_one: "Ajoutez un" + google_analytics_id: "Analyse ID" + back_to_trackers_list: "Retour à la liste des trackers " name: "Nom" description: "Description" type: "Catégorie" + default: "Erreur" calculator: "Calculateur" + zone: "Zone" + display: "Ecran" + environment: "Environnement" + active: "Actif" nore: "Plus" + no_results: "Aucun résultat" create: "Créer" loading: "Chargement en cours" email: Email @@ -2634,6 +2757,7 @@ fr_BE: my_account: "Mon compte" date: "Date" time: "Heure" + inventory_error_flash_for_insufficient_quantity: "Une donnée n'est plus disponible sur votre carte." inventory: Catalogue boutique zipcode: Code postal weight: Poids (au kg) @@ -2653,13 +2777,17 @@ fr_BE: bulk_order_management: "Gestion des commandes" subscriptions: "Abonnements" products: "Produits" + option_types: "Option Types " properties: "Labels / propriétés" + prototypes: "Prototypes" variant_overrides: "Catalogue du magasin" reports: "Rapports" + configuration: "Configuration" users: "Managers" roles: "Roles" order_cycles: "Cycles de vente" enterprises: "Entreprises" + enterprise_relationships: "Permissions" customers: "Acheteurs" groups: "Groupes" product_properties: @@ -2700,6 +2828,7 @@ fr_BE: title: "Distribution" distributor: "Distributeur : " order_cycle: "Cycle de vente : " + order_total: "Total commande " overview: products: active_products: @@ -2780,8 +2909,13 @@ fr_BE: bulk_coop_packing_sheets: 'Achats groupés - Feuilles de préparation des paniers' bulk_coop_customer_payments: 'Achats groupés - Paiement des acheteurs' enterprise_fee_summaries: + filters: + date_range: "Plage de dates" + report_format_csv: "Télécharger comme valeur décimale " + generate_report: "Générer un rapport" report: none: "Aucun" + select_and_search: "Sélectionner les filtres et cliquer sur GENERER RAPPORT pour accéder à vos données." users: index: listing_users: "Utilisateur d'annonces" @@ -2832,6 +2966,7 @@ fr_BE: item: "Déjà commandé dans ce cycle de vente" line_item: insufficient_stock: "Stock disponible insuffisant , il ne reste que %{on_hand}" + out_of_stock: "Pas en stock" shipment_states: backorder: réapprovisionnement partial: partiel diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml index 1d285296c2..e978c172e0 100644 --- a/config/locales/fr_CA.yml +++ b/config/locales/fr_CA.yml @@ -859,6 +859,8 @@ fr_CA: welcome_text: 'Vous avez créé avec succès ' next_step: Etape suivante choose_starting_point: 'Choisir le type de compte souhaité' + profile: 'Profil' + producer_profile: 'Profil producteur' invite_manager: user_already_exists: "Le compte existe déjà" error: "Un problème est survenu" @@ -2468,6 +2470,7 @@ fr_CA: pending: "en attente" ready: "prêt" shipped: "envoyé" + canceled: "annulé" payment_states: balance_due: "solde dû" completed: "effectué" @@ -2845,6 +2848,7 @@ fr_CA: title: "Distribution" distributor: "Distributeur : " order_cycle: "Cycle de vente : " + order_total: "Total Commande:" overview: products: active_products: diff --git a/config/locales/nb.yml b/config/locales/nb.yml index f4344af9ec..fc1abf1660 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -857,6 +857,8 @@ nb: welcome_text: Du har opprettet en next_step: Neste steg choose_starting_point: 'Velg din pakke:' + profile: 'Profil' + producer_profile: 'Produsentprofil' invite_manager: user_already_exists: "Brukeren eksisterer allerede" error: "Noe gikk galt" @@ -2457,6 +2459,7 @@ nb: pending: "i påvente av" ready: "klar" shipped: "sendt" + canceled: "avbrutt" payment_states: balance_due: "balanse forfaller" completed: "fullført" @@ -2832,6 +2835,7 @@ nb: title: "Distribusjon" distributor: "Distributør:" order_cycle: "Bestillingsrunde:" + order_total: "Bestilling Totalt" overview: products: active_products: diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml index 1d170dc965..c36c6645e7 100644 --- a/config/locales/nl_BE.yml +++ b/config/locales/nl_BE.yml @@ -242,6 +242,8 @@ nl_BE: quantity: Kwantiteit pick_up: Afhalen copy: Exemplaar + change_my_password: "Mijn paswoord wijzigen " + update_password: "Wachtwoord wijzigen " password_confirmation: Wachtwoord Bevestiging reset_password_token: Reset wachtwoord token expired: is verlopen, gelieve een nieuwe aan te vragen @@ -371,6 +373,7 @@ nl_BE: status: "Status" diff: "Diffuus" error: "Fout" + enable_products_cache: "Produkten in voorraad toelaten? " invoice_settings: edit: title: Factuur instellingen @@ -857,6 +860,8 @@ nl_BE: welcome_text: U heeft met succes een next_step: Volgende stap choose_starting_point: 'Kies je pakket:' + profile: 'Profiel' + producer_profile: 'Producentsprofiel' invite_manager: user_already_exists: "Gebruikersnaam al in gebruik" error: "Er ging iets mis" @@ -957,7 +962,7 @@ nl_BE: ofn_with_tip: Ondernemingen zijn producenten en/of hubs en zijn de basiseenheid van de organisatie binnen het Open Food Network. enterprises_hubs_tabs: has_no_payment_methods: "1%(enterprise) heeft geen betaalmethode" - has_no_shipping_methods: "heeft geen verzendmethodes" + has_no_shipping_methods: "%{enterprise} heeft geen verzendmethodes" has_no_enterprise_fees: "%{enterprise} geen bedrijfskosten heeft" enterprise_issues: create_new: Nieuw bericht @@ -1173,6 +1178,8 @@ nl_BE: tax_total: "BTW Totaal (%{rate}):" total_excl_tax: "Totaal (Excl. BTW):" total_incl_tax: "Totaal (Incl. BTW):" + abn: "Bedrijfsnummer : " + acn: "Intracommunautaire BTW nr. : " invoice_issued_on: "Aanmaakdatum Factuur:" order_number: "Factuurnummer:" date_of_transaction: "Transactiedatum:" @@ -1233,6 +1240,7 @@ nl_BE: no_shipping_or_payment: geen lever-of-betaalmethodes unconfirmed: Niet bevestigd days: dagen + authorization_failure: "Faling toelating " label_shop: "winkel" label_shops: "Winkels" label_map: "Kaart" @@ -1608,6 +1616,7 @@ nl_BE: products_available: Beschikbaar? products_producer: "Producent" products_price: "Prijs" + name_or_sku: "BESCHRIJVING OF ARTKELNUMMER" register_title: Registreer sell_title: "Registreer" sell_headline: "Sluit je aan op het Open Food Network!" @@ -1665,6 +1674,7 @@ nl_BE: orders_bought_edit_button: Pas de bevestigde artikels aan orders_bought_already_confirmed: "* reeds bevestigd" orders_confirm_cancel: Ben je zeker dat je deze bestelling wil annuleren? + order_processed_successfully: "Je bestelling is met succes geplaatst" products_cart_distributor_choice: "Verdeler voor jouw bestelling:" products_cart_distributor_change: "Je verdeler voor deze bestelling zal vervangen worden door %{name} indien je dit product toevoegt aan je winkelwagentje." products_cart_distributor_is: "Je verdeler voor deze bestelling heet %{name}." @@ -1745,11 +1755,13 @@ nl_BE: registration_about_us: "'Over Ons' tekst" registration_outcome_headline: "Wat krijg ik?" registration_outcome1_html: "Je profiel helpt mensen je te vindenen te contacterenop het Open Food Network." + registration_outcome2: "Maak gebruik van deze ruimte om het verhaal te doen van je onderneming,help verbindingen te maken naar jouw sociale en online aanwezigheid " registration_outcome3: "Het is ook de eerste stap naar handel op het Open Food Network, of om een online winkel te openen." registration_action: "Laten we beginnen !" details: title: "Details" headline: "Laten we beginnen" + enterprise: "Goed bezig! Eerst een woordje over je bedrijf. " producer: "Goed bezig! Eerst moeten we nog wat meer weten over je kweekbedrijf:" enterprise_name_field: "Naam bedrijf : " producer_name_field: "Naam boerderij : " @@ -1887,6 +1899,7 @@ nl_BE: ok: OK not_visible: niet zichtbaar you_have_no_orders_yet: "U heeft geen bestellingen momenteel" + show_only_complete_orders: "Uitsluitend de volledige bestellingen tonen" successfully_created: '%{resource}is met succes gedaan! ' successfully_removed: '%{resource}is succesvol verwijderd!' successfully_updated: '%{resource}is succesvol bijgewerkt!' @@ -2225,6 +2238,8 @@ nl_BE: shipping_methods: "Verzendmethodes" payment_methods: "Betaalmethodes" payment_method_fee: "Transactiekosten (excl.BTW)" + payment_processing_failed: "De betaling is niet succesvol, gelieve de ingevoerde gegevens na te kijken" + payment_updated: "Betaling is bijgewerkt" inventory_settings: "Catalogus winkel" tag_rules: "Tagregels" shop_preferences: "Voorkeuren winkel" @@ -2451,6 +2466,7 @@ nl_BE: pending: "in afwachting" ready: "klaar" shipped: "verzonden" + canceled: "geschrapt" payment_states: balance_due: "openstaande bedrag" completed: "voltooid" @@ -2546,9 +2562,11 @@ nl_BE: order_management: reports: enterprise_fee_summary: + date_end_before_start_error: "moet zijn na het starten " parameter_not_allowed_error: "Je hebt geen machtiging om één of meerdere geselecteerde filters toe te passen op dit verslag." fee_calculated_on_transfer_through_all: "Universum" fee_calculated_on_transfer_through_entire_orders: "Volledige Bestelling verzorgd door %{distributor}" + tax_category_various: "Verscheidene" fee_type: payment_method: "Betaaltransactie" shipping_method: "Verzending" @@ -2556,64 +2574,176 @@ nl_BE: supplier: "Binnenkomend" distributor: "Uitgaande" coordinator: "Coördinator" + tax_category_name: + shipping_instance_rate: " Commissiepercentage van de hub" formats: csv: header: fee_type: "Sprookjesachtig type" enterprise_name: "Bedrijfsbeheerder" + fee_name: "Naam van de commissie " customer_name: "Klant" + fee_placement: "invulplaats voor de commissie " + fee_calculated_on_transfer_through_name: "Berekening van de commissie op verdracht door" tax_category_name: "Belastingcategorie" html: header: fee_type: "Sprookjesachtig type" enterprise_name: "Bedrijfsbeheerder" + fee_name: "Naam van de commissie " customer_name: "Klant" + fee_placement: "invulplaats van de commissie " + fee_calculated_on_transfer_through_name: "Berekening van de commissie op verdracht door" tax_category_name: "Belastingcategorie" + invalid_filter_parameters: "De filters voor dit verslag zijn ongeldig." order: "Bestelling" distribution: "Distributie" + order_details: "Bestellingsgegevens" + customer_details: "Klantengegevens " + adjustments: "Correcties " + payments: "Betalingen " payment: "Betaling" payment_method: "Betaalmethode" shipment: "Verzending" + shipment_inc_vat: "Verzending BTW inbegrepen" + shipping_tax_rate: "Toegepaste BTW op verzending " category: "Categorie" delivery: "Levering" + temperature_controlled: "Temperatuurgestuurd" new_product: "Nieuw product" administration: "Administratie" + logged_in_as: "Ingevoerd als" account: "Account" logout: "Log uit" + date_range: "Datumbereik" + status: "status" + new: "Nieuw" start: "Start" + stop: "Stop" first: "Eerst" previous: "Voorgaande" last: "Laatst" spree: + your_order_is_empty_add_product: "Je bestelling is leeg, gelieve hierboven een product te zoeken en toe te voegen " + add_product: "Voeg een product toe" + name_or_sku: "Beschrijving of artikelnummer ( tenminste 4 letters van de productnaam invoeren )" resend: Zend opnieuw + back_to_orders_list: Terug naar de bestellingslijst + select_stock: "Selecteer voorraad" + location: "Locatie" quantity: "Kwantiteit" + package_from: "pakje van " + item_description: "Artikelbeschrijving" price: "Prijs" total: "Totaal" edit: "bewerking" + split: "Splits" delete: "Uitwissen " + cannot_set_shipping_method_without_address: "Verzendingswijze onmogelijk aan te duiden zolang de klantgegevens niet zijn ingevuld" + no_tracking_present: "Geen opvolging van de geleverde gegevens." + order_total: "Totaal bestelling" + customer_details: "Klantengegevens " + customer_search: "Opzoeken klant" + choose_a_customer: "Kies een klant" account: "Account" billing_address: "Factuuradres" shipping_address: "Adres Levering" + first_name: "Voornaam" + last_name: "Familienaam" + street_address: "Straat" + street_address_2: "Straat (vervolg)" city: "Stad" + zip: "Zip" country: "Land" state: "Staat" phone: "Telefoon" update: "Update" + use_billing_address: "Fakturatieadres gebruiken" + adjustments: "Correcties " continue: "Ga verder" + fill_in_customer_info: "Gelieve informatie over klant in te vullen" + new_payment: "Nieuwe betaling" + configurations: "configuraties " general_settings: "Algemene instellingen" + default_seo_title: "Standaardtitel SEO" + default_meta_description: "Standaard Meta Beschrijving" + default_meta_keywords: "Standaard Meta Sleutelwoorden " + security_settings: "Beveiligheidsinstellingen" + allow_ssl_in_development_and_test: "SSL toelaten bij ontwikkeling en testmode" + allow_ssl_in_production: "SSl toelaten wanneer in productiemode wordt gebruikt " + allow_ssl_in_staging: "SSL toelaten wanneer in mode zichtbaar wordt gebruikt" + check_for_spree_alerts: "Let op voor spree alerten " + currency_decimal_mark: "Valuta 1 decimaal bij" + currency_settings: "Gebruikte munt" + currency_symbol_position: Zet "muntsymbool voor of na het bedrag?" + currency_thousands_separator: "Valuta met scheiding van duizenden" + display_currency: "Munt tonen" + choose_currency: "Munt kiezen " + mail_method_settings: "instellingen mailwijze " + enable_mail_delivery: "Mogelijk de mail te leveren" + send_mails_as: "Stuur mail als" + smtp_send_all_emails_as_from_following_address: "Stuur alle mails als van het volgend adres" + send_copy_of_all_mails_to: "Stuur kopie van alle mails naar" + smtp_send_copy_to_this_addresses: "Stuurt een kopie van alle uitgaande mails naar dit adres. In geval van meerdere adressen, die met een comma scheiden." + intercept_email_address: "Email adres onderscheppen" + intercept_email_instructions: "De mailontvanger omzeilen en door dit adres vervangen. " + smtp: "SMTP" + smtp_domain: "SMTP Domein" + smtp_mail_host: "SMPT Mail Host" + smtp_username: "SMPT Gebruikersnaam" + smtp_password: "SMPT Wachtwoord" + image_settings: "Beeldinstellingen " + image_settings_warning: "Logos regeneren als de paperclips stylen bijgewerkt worden. Paperclip harken gebruiken :opfrissen:logos CLASS=Spree::Image om het doen. " + attachment_default_style: Bijlagestijl + attachment_default_url: "Standaard Band met URL" + attachment_styles: "Paperclipstijlen" + add_new_style: "Een nieuwe stijl toevoegen" + image_settings_updated: "Beeldinstellingen zijn met succes bijgewerkt." tax_categories: "Belastingcategorieën" + listing_tax_categories: "Lijst BTW categoriëen " + back_to_tax_categories_list: "Terug naar de lijst BTW categoriëen " tax rate: "Percentage belasting" + new_tax_rate: "Nieuwe BTW percentage" tax_category: "Belastingcategorie" + rate: "Percentage" + tax_rate_amount_explanation: "BTW percentages zijn decimaal om de berekening gemakkelijker te maken, (bv. als de percentage 5% is dan 0.05 invoeren)" + included_in_price: "In de prijs inbegrepen " + show_rate_in_label: "Toon de percentahe op de label " + back_to_tax_rates_list: "Terug naar de lijst BTW percentages" tax_settings: "Belastings Instellingen" + zones: "Zones " + new_zone: "Nieuwe zone" + default_tax: "Standaard BTW " + default_tax_zone: "Standaard BTW zone " + iso_name: "ISO Naam" + abbreviation: "Afkortingen " payment_methods: "Betalingsmethode" new_payment_method: "Nieuwe betalingswijze" + provider: "Leverancier" + taxonomies: "Taxonomies " + new_taxonomy: "Nieuwe taxonomie " + back_to_taxonomies_list: "Terug naar de lijst Taxonomies" shipping_methods: "Methode Verzending" shipping_categories: "Verzendingscategorieën" + new_shipping_category: "Nieuwe verzendingscategorie" + back_to_shipping_categories: "Terug naar verzendingscategoriëen" + analytics_trackers: "Analyse van Trackers" + no_trackers_found: "Geen Trackers gevonden" + new_tracker: "Nieuwe Tracker" + add_one: "Eén toevoegen" + google_analytics_id: "ID analyse " + back_to_trackers_list: "Terug naar de Trackerslijst" name: "Naam" description: "Beschrijving" type: "Type" + default: "Standaard" calculator: "Rekenmachine" + zone: "Zone" + display: "Display" + environment: "Omgeving" + active: "Aktief" nore: "Meer" + no_results: "Geen resultaten " create: "Maak" loading: "Aan het opladen" email: Email @@ -2621,6 +2751,7 @@ nl_BE: my_account: "Mijn rekening" date: "Afspraakje" time: "Uur" + inventory_error_flash_for_insufficient_quantity: "Een gegeven op je kaart is onbereikbaar." inventory: Inventarisatie zipcode: Postcode weight: Gewicht (per kg) @@ -2641,12 +2772,15 @@ nl_BE: subscriptions: "Abonnementen" products: "Producten" properties: "Eigenschappen" + prototypes: "Prototypes " variant_overrides: "Inventarisatie" reports: "Rapporten" + configuration: "Instelling" users: "Gebruikers" roles: "Rollen" order_cycles: "Bestel cycli" enterprises: "Ondernemingen" + enterprise_relationships: "Toelatingen" customers: "Klanten" groups: "Groepen" product_properties: @@ -2687,6 +2821,7 @@ nl_BE: title: "Distributie" distributor: "Verdeler" order_cycle: "Bestelcyclus" + order_total: "Totaal bestelling" overview: products: active_products: @@ -2768,6 +2903,7 @@ nl_BE: bulk_coop_customer_payments: 'Groepsaankoop-betalingen van de klanten' enterprise_fee_summaries: filters: + date_range: "Datumbereik" report_format_csv: "Opladen als CSV" generate_report: "Ontwikkel verslag" report: @@ -2823,6 +2959,7 @@ nl_BE: item: "Reeds besteld in de huidige bestelcyclus" line_item: insufficient_stock: "Onvoldoende voorraad beschikbaar, alleen %{on_hand}resterend" + out_of_stock: "Geen voorraad" shipment_states: backorder: aanvulling partial: gedeeltelijk diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 5c45400a8c..d063ccfd58 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -2838,6 +2838,7 @@ pt: title: "Distribuição" distributor: "Distribuidor:" order_cycle: "Ciclo de encomendas:" + order_total: "Total da Encomenda" overview: products: active_products: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 71f2dd3d36..2c1a51d4ac 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -533,6 +533,8 @@ sv: welcome_title: Välkommen till OFN! welcome_text: Du har korrekt slutfört en next_step: Nästa steg + profile: 'Profil' + producer_profile: 'Producentprofil' order_cycles: edit: advanced_settings: Avancerade inställningar From 5e672dc7d440f0d8943014c0c71e7ff7d0cf038f Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Mon, 8 Apr 2019 21:03:32 +1000 Subject: [PATCH 14/29] Updating translations for config/locales/pt.yml --- config/locales/pt.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/pt.yml b/config/locales/pt.yml index d063ccfd58..e33a3cc695 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -2838,6 +2838,8 @@ pt: title: "Distribuição" distributor: "Distribuidor:" order_cycle: "Ciclo de encomendas:" + line_item_adjustments: "Ajustes aos Items da Encomenda" + order_adjustments: "Ajustes à Encomenda" order_total: "Total da Encomenda" overview: products: From fde3d72a6677fcb34e36279b5f3f7aace9f8360b Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Tue, 9 Apr 2019 00:18:48 +1000 Subject: [PATCH 17/29] Updating translations for config/locales/en_GB.yml --- config/locales/en_GB.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 06177a0bc0..7093ade553 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -2842,6 +2842,8 @@ en_GB: title: "Distribution" distributor: "Distributor:" order_cycle: "Order cycle:" + line_item_adjustments: "Line Item Adjustments" + order_adjustments: "Order Adjustments" order_total: "Order Total" overview: products: From 029e8eb848cda9f42dbef6553cd63105e07fccc2 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Tue, 9 Apr 2019 20:50:31 +1000 Subject: [PATCH 19/29] Updating translations for config/locales/de_DE.yml --- config/locales/de_DE.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml index 077e10a65a..3b2cc74e47 100644 --- a/config/locales/de_DE.yml +++ b/config/locales/de_DE.yml @@ -2841,6 +2841,9 @@ de_DE: title: "Verteilung" distributor: "Verteiler:" order_cycle: "Bestellzyklus:" + line_item_adjustments: "Anpassungen der Werbebuchung" + order_adjustments: "Bestellanpassungen" + order_total: "Auftrag insgesamt" overview: products: active_products: From 37cbfcb6925fd0287d830a4dbed65ca943222c2b Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 10 Apr 2019 17:17:17 +0100 Subject: [PATCH 20/29] Use ENV var for backups bucket --- config/initializers/db2fog.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/db2fog.rb b/config/initializers/db2fog.rb index 7c7a2d6d39..1e05ceae1a 100644 --- a/config/initializers/db2fog.rb +++ b/config/initializers/db2fog.rb @@ -2,6 +2,6 @@ DB2Fog.config = { :aws_access_key_id => Spree::Config[:s3_access_key], :aws_secret_access_key => Spree::Config[:s3_secret], - :directory => Spree::Config[:s3_bucket], + :directory => ENV['S3_BACKUPS_BUCKET'], :provider => 'AWS' } From 2ac981a9a30645be82d8c31a440ed1fb4e6d1fb1 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 10 Apr 2019 17:17:43 +0100 Subject: [PATCH 21/29] Make db2fog tasks conditional --- config/schedule.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/schedule.rb b/config/schedule.rb index 4bb20df545..4cb7a5c1ca 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -21,11 +21,11 @@ every 1.day, at: '12:05am' do end every 1.day, at: '2:45am' do - rake 'db2fog:clean' + rake 'db2fog:clean' if ENV['S3_BACKUPS_BUCKET'] end every 4.hours do - rake 'db2fog:backup' + rake 'db2fog:backup' if ENV['S3_BACKUPS_BUCKET'] end every 5.minutes do From 4912a9e258a7b3d85b175029cd626162d44db806 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:10:31 +0100 Subject: [PATCH 22/29] Ensure ENV vars in applications.yml actually update stored Spree::Config preferences --- config/initializers/spree.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index e63d21bde9..9b2ea5d3c4 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -20,6 +20,12 @@ Spree.config do |config| # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface. config.auto_capture = true #config.override_actionmailer_config = false + + # S3 settings + config.s3_bucket = ENV['S3_BUCKET'] if ENV['S3_BUCKET'] + config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY'] + config.s3_secret = ENV['S3_SECRET'] if ENV['S3_SECRET'] + config.use_s3 = true if ENV['S3_ACCESS_KEY'] && ENV['S3_SECRET'] end # Don't log users out when setting a new password From 7373fff1902e40cc9bf7a5b5ca699bce54b1d79b Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:23:16 +0100 Subject: [PATCH 23/29] Define default s3_protocol as 'https' --- config/initializers/spree.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index 9b2ea5d3c4..e05f847f00 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -26,6 +26,7 @@ Spree.config do |config| config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY'] config.s3_secret = ENV['S3_SECRET'] if ENV['S3_SECRET'] config.use_s3 = true if ENV['S3_ACCESS_KEY'] && ENV['S3_SECRET'] + config.s3_protocol = ENV.fetch('S3_PROTOCOL', 'https') end # Don't log users out when setting a new password From b6989c6d6e73b2efa94b8693ead84c5e8c3bc0cf Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Fri, 12 Apr 2019 01:05:30 +1000 Subject: [PATCH 24/29] Updating translations for config/locales/nl_BE.yml --- config/locales/nl_BE.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml index c36c6645e7..0860e54c21 100644 --- a/config/locales/nl_BE.yml +++ b/config/locales/nl_BE.yml @@ -1198,7 +1198,9 @@ nl_BE: menu_5_title: "Over" menu_5_url: "http://www.openfoodnetwork.org/" menu_6_title: "Connecteer je " + menu_6_url: "https://openfoodnetwork.org/au/connect/" menu_7_title: "Ontdek" + menu_7_url: "https://openfoodnetwork.org/au/learn/" logo: "Logo (640x130)" logo_mobile: "Logo Mobiel (75x26)" logo_mobile_svg: "Logo Mobiel (SVG)" @@ -2586,6 +2588,7 @@ nl_BE: fee_placement: "invulplaats voor de commissie " fee_calculated_on_transfer_through_name: "Berekening van de commissie op verdracht door" tax_category_name: "Belastingcategorie" + total_amount: "$$ SUM" html: header: fee_type: "Sprookjesachtig type" @@ -2595,6 +2598,7 @@ nl_BE: fee_placement: "invulplaats van de commissie " fee_calculated_on_transfer_through_name: "Berekening van de commissie op verdracht door" tax_category_name: "Belastingcategorie" + total_amount: "$$ SUM" invalid_filter_parameters: "De filters voor dit verslag zijn ongeldig." order: "Bestelling" distribution: "Distributie" @@ -2631,6 +2635,7 @@ nl_BE: back_to_orders_list: Terug naar de bestellingslijst select_stock: "Selecteer voorraad" location: "Locatie" + count_on_hand: "Count On Hand" quantity: "Kwantiteit" package_from: "pakje van " item_description: "Artikelbeschrijving" @@ -2665,6 +2670,8 @@ nl_BE: new_payment: "Nieuwe betaling" configurations: "configuraties " general_settings: "Algemene instellingen" + site_name: "Website Naam" + site_url: "website URL" default_seo_title: "Standaardtitel SEO" default_meta_description: "Standaard Meta Beschrijving" default_meta_keywords: "Standaard Meta Sleutelwoorden " @@ -2677,9 +2684,11 @@ nl_BE: currency_settings: "Gebruikte munt" currency_symbol_position: Zet "muntsymbool voor of na het bedrag?" currency_thousands_separator: "Valuta met scheiding van duizenden" + hide_cents: "Verberg centen" display_currency: "Munt tonen" choose_currency: "Munt kiezen " mail_method_settings: "instellingen mailwijze " + general: "Algemeen" enable_mail_delivery: "Mogelijk de mail te leveren" send_mails_as: "Stuur mail als" smtp_send_all_emails_as_from_following_address: "Stuur alle mails als van het volgend adres" @@ -2690,13 +2699,18 @@ nl_BE: smtp: "SMTP" smtp_domain: "SMTP Domein" smtp_mail_host: "SMPT Mail Host" + smtp_port: "SMTP Port" + secure_connection_type: "Secure Connection Type" + smtp_authentication_type: "SMTP Authentication Type" smtp_username: "SMPT Gebruikersnaam" smtp_password: "SMPT Wachtwoord" image_settings: "Beeldinstellingen " image_settings_warning: "Logos regeneren als de paperclips stylen bijgewerkt worden. Paperclip harken gebruiken :opfrissen:logos CLASS=Spree::Image om het doen. " attachment_default_style: Bijlagestijl attachment_default_url: "Standaard Band met URL" + attachment_path: "Pad bijlagen" attachment_styles: "Paperclipstijlen" + attachment_url: "URL bijlagen" add_new_style: "Een nieuwe stijl toevoegen" image_settings_updated: "Beeldinstellingen zijn met succes bijgewerkt." tax_categories: "Belastingcategorieën" @@ -2715,8 +2729,17 @@ nl_BE: new_zone: "Nieuwe zone" default_tax: "Standaard BTW " default_tax_zone: "Standaard BTW zone " + country_based: "Land gebaseerd" + state_based: "Provincie gebaseerd" + countries: "Landen" + listing_countries: "Listing Landen" iso_name: "ISO Naam" + states_required: "Staten Vereist" + editing_country: "Editing Land" + back_to_countries_list: "Terug naar landenlijst" + states: "Provincies" abbreviation: "Afkortingen " + new_state: "Nieuw Provincie" payment_methods: "Betalingsmethode" new_payment_method: "Nieuwe betalingswijze" provider: "Leverancier" @@ -2771,6 +2794,7 @@ nl_BE: bulk_order_management: "Beheer van bulkorders" subscriptions: "Abonnementen" products: "Producten" + option_types: "Optietypen" properties: "Eigenschappen" prototypes: "Prototypes " variant_overrides: "Inventarisatie" @@ -2821,6 +2845,8 @@ nl_BE: title: "Distributie" distributor: "Verdeler" order_cycle: "Bestelcyclus" + line_item_adjustments: "Regelitems aanpassen" + order_adjustments: "Orden aanpassingen" order_total: "Totaal bestelling" overview: products: From 45ca63e751a87a6056fe3eb8ac7270eb063eb5b6 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Fri, 12 Apr 2019 01:14:59 +1000 Subject: [PATCH 25/29] Updating translations for config/locales/fr_BE.yml --- config/locales/fr_BE.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml index f471a9c2f1..9a59c7b8be 100644 --- a/config/locales/fr_BE.yml +++ b/config/locales/fr_BE.yml @@ -88,6 +88,7 @@ fr_BE: cloned_order_cycle_name: "Copie de %{order_cycle}" validators: date_time_string_validator: + not_string_error: "doit être une chaîne" invalid_format_error: "doit être valide " integer_array_validator: not_array_error: "doit être un array" @@ -2592,6 +2593,7 @@ fr_BE: fee_placement: "Emplacement commission" fee_calculated_on_transfer_through_name: "Calcul de la commission sur cession par" tax_category_name: "TVA applicable" + total_amount: "€€ SOMME" html: header: fee_type: "Type de marge" @@ -2601,6 +2603,7 @@ fr_BE: fee_placement: "Emplacement commission" fee_calculated_on_transfer_through_name: "Calcul de la commission sur cession par" tax_category_name: "TVA applicable" + total_amount: "€€ SOMME" invalid_filter_parameters: "Les filtres sélectionnés pour ce rapport ne sont pas valides." order: "Commandes à venir" distribution: "Distribution" @@ -2637,6 +2640,7 @@ fr_BE: back_to_orders_list: 'Retour vers la liste des commandes ' select_stock: "Selectionner stock" location: "Site" + count_on_hand: "Compté à la main" quantity: "Nb commandé" package_from: "colis provenant de " item_description: "Description de l'article " @@ -2671,6 +2675,8 @@ fr_BE: new_payment: "Nouveau paiement" configurations: "Configurations" general_settings: "Réglages Généraux" + site_name: "Nom du site" + site_url: "Site URL" default_seo_title: "Titre SEO par défaut" default_meta_description: "Meta Description par défaut" default_meta_keywords: "Meta Mots-clés par défaut" @@ -2681,10 +2687,13 @@ fr_BE: check_for_spree_alerts: "Attention aux alertes en série " currency_decimal_mark: "Devise à la décimale " currency_settings: "Devise " + currency_symbol_position: Mettez "symbole monétaire avant ou après le montant en euros?" currency_thousands_separator: "Devise avec séparateur de mille" + hide_cents: "Masquer les cents" display_currency: "Afficher devise " choose_currency: "Choisir devise " mail_method_settings: "Paramètres du moyen mail" + general: "Généralement" enable_mail_delivery: "Possible de livrer le mail" send_mails_as: "Envoyer les mails comme " smtp_send_all_emails_as_from_following_address: "Envoyer tous les mails comme de l'adresse suivante." @@ -2695,13 +2704,18 @@ fr_BE: smtp: "SMTP" smtp_domain: "Domaine SMPT" smtp_mail_host: "SMPT Serveur mail" + smtp_port: "SMTP Port" + secure_connection_type: "Type de connexion sécurisée" + smtp_authentication_type: "Type d'authentification SMTP" smtp_username: " SMPT Nom d’utilisateur " smtp_password: "SMPT Mot de passe" image_settings: "Paramètres image" image_settings_warning: "Il est nécessaire de régénérer des logos lors de la mise à jour des styles de trombones . Utiliser ratisser trombone:rafraîchir:logos CLASS=Spree::Image pour faire ceci. " attachment_default_style: Style Pièces jointes attachment_default_url: "Joint à URL par défaut" + attachment_path: "Pièces jointes liés" attachment_styles: "Styles trombones" + attachment_url: "URL lié" add_new_style: "Ajouter un nouveau style " image_settings_updated: "Paramètres Image mis à jour avec succès." tax_categories: "TVA applicable" @@ -2720,9 +2734,17 @@ fr_BE: new_zone: "Nouvelle zone " default_tax: "TVA par défaut" default_tax_zone: "Zone TVA par défaut" + country_based: "Basé sur le pays" + state_based: "Basé sur la Province" + countries: "Pays" + listing_countries: "Liste des pays" iso_name: "Nom ISO" + states_required: "Provinces requises" + editing_country: "Pays d'édition" back_to_countries_list: "Retouner vers la liste des pays" + states: "Province" abbreviation: "Abréviation" + new_state: "Nouvelle Province" payment_methods: "Méthodes de paiement" new_payment_method: "Nouvelle méthode de paiement" provider: "Fournisseur" @@ -2828,6 +2850,8 @@ fr_BE: title: "Distribution" distributor: "Distributeur : " order_cycle: "Cycle de vente : " + line_item_adjustments: "Ajustements d'élément de ligne" + order_adjustments: "Ajustement de commandes" order_total: "Total commande " overview: products: From 418d80bdc09fd338de8ba8834459d8e594bab4f3 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Mon, 15 Apr 2019 17:05:00 +1000 Subject: [PATCH 26/29] Updating translations for config/locales/ca.yml --- config/locales/ca.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 8825827c56..b0a23d0832 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -2841,6 +2841,8 @@ ca: title: "Distribució" distributor: "Distribuïdora:" order_cycle: "Cicle de comanda:" + line_item_adjustments: "Ajustaments de la línia de comanda" + order_adjustments: "Ajustaments de comandes" order_total: "Total comanda" overview: products: From 10c917a693fd638195f918b13a620dfcba217e85 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Mon, 15 Apr 2019 17:08:06 +1000 Subject: [PATCH 27/29] Updating translations for config/locales/ca.yml --- config/locales/ca.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index b0a23d0832..410c1903a7 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1427,7 +1427,7 @@ ca: email_signoff: "Salut," email_signature: "Equip %{sitename}" email_confirm_customer_greeting: "Hola %{name}," - email_confirm_customer_intro_html: "Gràcies per comprar a %{distributor} ." + email_confirm_customer_intro_html: "Gràcies per comprar a %{distributor}." email_confirm_customer_number_html: "Confirmació de la comanda # %{number} " email_confirm_customer_details_html: "Aquests són els detalls de la teva comanda de %{distributor} :" email_confirm_customer_signoff: "Salutacions cordials," From 1b01c44ce4e1d88c4b29222e1a31dde063102ec5 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Mon, 15 Apr 2019 19:12:19 +1000 Subject: [PATCH 28/29] Updating translations for config/locales/es.yml --- config/locales/es.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/es.yml b/config/locales/es.yml index 17ba43eb59..4fe8532810 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2842,6 +2842,8 @@ es: title: "Distribución" distributor: "Distribuidora:" order_cycle: "Ciclo de pedido:" + line_item_adjustments: "Ajustes de artículo" + order_adjustments: "Ajustes de pedido" order_total: "Total del pedido" overview: products: