From 9688fe7540c0cd1549b2344c410b6baf147d9689 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 20 Feb 2019 06:15:01 +1100 Subject: [PATCH 1/2] Updating translations for config/locales/fr.yml --- config/locales/fr.yml | 75 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index eb434d850e4..cbc55cab188 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -31,6 +31,16 @@ fr: on_demand_but_count_on_hand_set: "doit être vide si \"à volonté\"" limited_stock_but_no_count_on_hand: "doit être spécifié car pas \"à volonté\"" activemodel: + attributes: + order_management/reports/enterprise_fee_summary/parameters: + start_at: "Début" + end_at: "Fin" + distributor_ids: "Hubs" + producer_ids: "Producteurs" + order_cycle_ids: "Cycles de vente" + enterprise_fee_ids: "Nom des marges et commissions" + shipping_method_ids: "Méthodes de livraison" + payment_method_ids: "Méthodes de paiement" errors: models: subscription_validator: @@ -74,6 +84,13 @@ fr: models: order_cycle: cloned_order_cycle_name: "Copie de %{order_cycle}" + validators: + date_time_string_validator: + not_string_error: "doit être une série" + invalid_format_error: "doit être valide" + integer_array_validator: + not_array_error: "doit être une séquence" + invalid_element_error: "doit contenir uniquement des nombres entiers" enterprise_mailer: confirmation_instructions: subject: "Confirmez l'adresse email pour %{enterprise}" @@ -995,6 +1012,9 @@ fr: description: Factures pour import dans Xero packing: name: Rapports de préparation des paniers + enterprise_fee_summary: + name: "Résumé des marges et commissions" + description: "Résumé des marges et commissions collectées" subscriptions: subscriptions: Abonnements new: Nouvel abonnement @@ -1028,6 +1048,7 @@ fr: this_is_an_estimate: | Les prix affichés ne sont qu'une estimation calculée au moment de la dernière modification de l'abonnement. Si vous modifiez les prix ou marges et commissions appliquées, les commandes seront mises à jour, mais l'abonnement affichera toujours les anciennes valeurs. + not_in_open_and_upcoming_order_cycles_warning: "Il n'y a pas de cycle de vente ouvert ou à venir pour ce produit." details: details: Informations invalid_error: Oups! Veuillez remplir tous les champs obligatoires... @@ -1042,6 +1063,7 @@ fr: details: Informations address: Adresse products: Produits + no_open_or_upcoming_order_cycle: "Pas de cycles de vente prévus." product_already_in_order: Ce produit a déjà été ajouté à la commande. Veuillez directement modifier la quantité. orders: number: Nombre @@ -1997,7 +2019,6 @@ fr: spree_admin_enterprises_none_text: "Vous n'avez pas encore d'entreprise" spree_admin_enterprises_tabs_hubs: "HUBS" spree_admin_enterprises_producers_manage_products: "GÉRER LES PRODUITS" - spree_admin_enterprises_any_active_products_text: "Vous n'avez aucun produit actif." spree_admin_enterprises_create_new_product: "CRÉER UN NOUVEAU PRODUIT" spree_admin_single_enterprise_alert_mail_confirmation: "Veuillez confirmer l'adresse mail pour" spree_admin_single_enterprise_alert_mail_sent: "Email envoyé à " @@ -2531,6 +2552,45 @@ fr: producers: signup: start_free_profile: "Commencez par créer votre profil entreprise, et changez de formule quand vous êtes prêt !" + order_management: + reports: + enterprise_fee_summary: + date_end_before_start_error: "doit être après date début" + parameter_not_allowed_error: "Vous n'êtes pas authorisé.e à utiliser un ou plusieurs des filtres sélectionnés pour ce rapport." + fee_calculated_on_transfer_through_all: "Tous" + fee_calculated_on_transfer_through_entire_orders: "Commandes complètes via %{distributor}" + tax_category_various: "Multiples" + fee_type: + payment_method: "Méthodes de paiement" + shipping_method: "Livraison" + fee_placements: + 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: "Marge de la plateforme" + formats: + csv: + header: + fee_type: "Type de marge" + enterprise_name: "Gestionnaire de l'entreprise" + fee_name: "Nom de la marge/commission" + customer_name: "Acheteur" + fee_placement: "Capture des frais" + fee_calculated_on_transfer_through_name: "Calc. des frais sur les transferts via" + tax_category_name: "TVA applicable" + total_amount: "€ total" + html: + header: + fee_type: "Type de marge" + enterprise_name: "Gestionnaire de l'entreprise" + fee_name: "Nom de la marge/commission" + customer_name: "Acheteur" + fee_placement: "Saisie de la marge" + fee_calculated_on_transfer_through_name: "Calc. des frais sur les transferts via" + tax_category_name: "TVA applicable" + total_amount: "€ total" + invalid_filter_parameters: "Les filtres sélectionnés pour ce rapport sont invalides." spree: email: Email account_updated: "Compte mis à jour!" @@ -2574,6 +2634,11 @@ fr: distributor: "Distributeur : " order_cycle: "Cycle de vente : " overview: + products: + active_products: + zero: "Vous n'avez aucun produit actif." + one: "Vous avez un produit actif" + other: "Vous avez %{count} produits actifs" order_cycles: order_cycles: "Cycles de vente" order_cycles_tip: "Les cycles de vente définissent quand et où vos produits peuvent être commandés par vos acheteurs." @@ -2647,6 +2712,14 @@ fr: bulk_coop_allocation: 'Achats groupés - Allocation' 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: "Période" + report_format_csv: "Télécharger le CSV" + generate_report: "Générer le rapport" + report: + none: "Aucun" + select_and_search: "Sélectionnez les filtres et cliquez sur \"générer le rapport\" pour accéder aux données." users: index: listing_users: "Liste des utilisateurs" From 7e59132bb24721d81d8e6157acfd410e3ae767ac Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 20 Feb 2019 06:50:52 +1100 Subject: [PATCH 2/2] Updating translations for config/locales/en_GB.yml --- config/locales/en_GB.yml | 77 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index a687a16f0e7..093c19f46b7 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -31,6 +31,16 @@ en_GB: on_demand_but_count_on_hand_set: "must be blank if on demand" limited_stock_but_no_count_on_hand: "must be specified because forcing limited stock" activemodel: + attributes: + order_management/reports/enterprise_fee_summary/parameters: + start_at: "Start" + end_at: "End" + distributor_ids: "Hubs" + producer_ids: "Pricing" + order_cycle_ids: "Order Cycles" + enterprise_fee_ids: "Fees Names" + shipping_method_ids: "Shipping Methods" + payment_method_ids: "Payment Methods" errors: models: subscription_validator: @@ -74,6 +84,13 @@ en_GB: models: order_cycle: cloned_order_cycle_name: "COPY OF %{order_cycle}" + validators: + date_time_string_validator: + not_string_error: "must be a string" + invalid_format_error: "must be valid" + integer_array_validator: + not_array_error: "must be an array" + invalid_element_error: "must contain only valid integers" enterprise_mailer: confirmation_instructions: subject: "Please confirm the email address for %{enterprise}" @@ -994,6 +1011,9 @@ en_GB: description: Invoices for import into Xero packing: name: Packing Reports + enterprise_fee_summary: + name: "Enterprise Fee Summary" + description: "Summary of Enterprise Fees collected" subscriptions: subscriptions: Subscriptions new: New Subscription @@ -1161,8 +1181,8 @@ en_GB: menu_1_url: "/shops" menu_2_title: "Map" menu_2_url: "/map" - menu_3_title: "Services" - menu_3_url: "https://about.openfoodnetwork.org.uk/services" + menu_3_title: "Pricing" + menu_3_url: "https://about.openfoodnetwork.org.uk/pricing-and-plans" menu_4_title: "Groups" menu_4_url: "/groups" menu_5_title: "About" @@ -1998,7 +2018,6 @@ en_GB: spree_admin_enterprises_none_text: "You don't have any enterprises yet" spree_admin_enterprises_tabs_hubs: "HUBS" spree_admin_enterprises_producers_manage_products: "MANAGE PRODUCTS" - spree_admin_enterprises_any_active_products_text: "You don't have any active products." spree_admin_enterprises_create_new_product: "CREATE A NEW PRODUCT" spree_admin_single_enterprise_alert_mail_confirmation: "Please confirm the email address for" spree_admin_single_enterprise_alert_mail_sent: "We've sent an email to" @@ -2527,6 +2546,45 @@ en_GB: producers: signup: start_free_profile: "Start with a free profile, and expand when you're ready!" + order_management: + reports: + enterprise_fee_summary: + date_end_before_start_error: "must be after start" + parameter_not_allowed_error: "You are not authorised to use one or more selected filters for this report." + fee_calculated_on_transfer_through_all: "All" + fee_calculated_on_transfer_through_entire_orders: "Entire Orders through %{distributor}" + tax_category_various: "Various" + fee_type: + payment_method: "Payment Transaction" + shipping_method: "Shipment" + fee_placements: + supplier: "Incoming" + distributor: "Outgoing" + coordinator: "Coordinator" + tax_category_name: + shipping_instance_rate: "Platform Rate" + formats: + csv: + header: + fee_type: "Fee Type" + enterprise_name: "Enterprise Owner" + fee_name: "Fee Name" + customer_name: "Customer" + fee_placement: "Fee Placement" + fee_calculated_on_transfer_through_name: "Fee Calc on Transfer Through" + tax_category_name: "Tax Category" + total_amount: "$$ SUM" + html: + header: + fee_type: "Fee Type" + enterprise_name: "Enterprise Owner" + fee_name: "Fee Name" + customer_name: "Customer" + fee_placement: "Fee Placement" + fee_calculated_on_transfer_through_name: "Fee Calc on Transfer Through" + tax_category_name: "Tax Category" + total_amount: "$$ SUM" + invalid_filter_parameters: "The filters you selected for this report are invalid." spree: email: Email account_updated: "Account updated!" @@ -2570,6 +2628,11 @@ en_GB: distributor: "Distributor:" order_cycle: "Order cycle:" overview: + products: + active_products: + zero: "You don't have any active products." + one: "You have one active product" + other: "You have %{count} active products" order_cycles: order_cycles: "Order Cycles" order_cycles_tip: "Order cycles determine when and where your products are available to customers." @@ -2643,6 +2706,14 @@ en_GB: bulk_coop_allocation: 'Bulk Co-op - Allocation' bulk_coop_packing_sheets: 'Bulk Co-op - Packing Sheets' bulk_coop_customer_payments: 'Bulk Co-op - Customer Payments' + enterprise_fee_summaries: + filters: + date_range: "Date Range" + report_format_csv: "Download as CSV" + generate_report: "Generate Report" + report: + none: "None" + select_and_search: "Select filters and click on GENERATE REPORT to access your data." users: index: listing_users: "Listing Users"