From ed27ed32e35807bf4abe57fba10999e4e4998cec Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Sun, 24 May 2020 19:14:25 +1000 Subject: [PATCH 1/6] Updating translations for config/locales/fr.yml --- config/locales/fr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index daf6a635e3..9e2bd0597e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -687,6 +687,7 @@ fr: ofn_uid_tip: L'identifiant unique pour les comptes entreprises sur Open Food Network. shipping_methods: name: "Nom" + applies: "Active ?" manage: "Gérer les méthodes de livraison" create_button: "Créer nouvelle méthode de livraison" create_one_button: "En créer une maintenant" @@ -3110,6 +3111,7 @@ fr: zones: "Zones" both: "Vu par l'acheteur sur la boutique" back_end: "Visible pour l'administration uniquement" + deactivation_warning: "Désactiver une méthode de livraison peut engendre sa disparition de la liste ici. Si vous souhaitez uniquement ne plus l'afficher pour l'acheteur, modifiez-là et utilisez l'option d'affichage \"visible pour l'administrateur uniquement\"." payment_methods: new: new_payment_method: "Nouvelle méthode de paiement" @@ -3269,6 +3271,7 @@ fr: format: '%Y-%m-%d' js_format: 'yy-mm-dd' orders: + error_flash_for_unavailable_items: "Un élément de votre panier est épuisé. Veuillez mettre à jour les quantités sélectionnées." edit: login_to_view_order: "Veuillez vous connecter pour voir votre commande." bought: From 5de3fbba1ed53fd0f9e72caccd1c89d13ea4e4f7 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Sun, 24 May 2020 19:14:49 +1000 Subject: [PATCH 2/6] Updating translations for config/locales/en_FR.yml --- config/locales/en_FR.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/en_FR.yml b/config/locales/en_FR.yml index 20356fecae..267ab53b2a 100644 --- a/config/locales/en_FR.yml +++ b/config/locales/en_FR.yml @@ -686,6 +686,7 @@ en_FR: ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network. shipping_methods: name: "Name" + applies: "Active?" manage: "Manage Shipping Methods" create_button: "Create New Shipping Method" create_one_button: "Create One Now" @@ -3080,6 +3081,7 @@ en_FR: zones: "Zones" both: "Both Checkout and Back office" back_end: "Back office only" + deactivation_warning: "De-activating a shipping method can make the shipping method disappear from your list. Alternatively, you can hide a shipping method from the checkout page by setting the option 'Display' to 'back office only'." payment_methods: new: new_payment_method: "New Payment Method" @@ -3239,6 +3241,7 @@ en_FR: format: '%Y-%m-%d' js_format: 'yy-mm-dd' orders: + error_flash_for_unavailable_items: "An item in your cart has become unavailable. Please update the selected quantities." edit: login_to_view_order: "Please log in to view your order." bought: From d9d221e4f35017e6fdcb1aba0fcc18b762317713 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Mon, 25 May 2020 18:46:48 +1000 Subject: [PATCH 3/6] Updating translations for config/locales/en_GB.yml --- config/locales/en_GB.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index a2853f61a7..c20656fd5d 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -686,6 +686,7 @@ en_GB: ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network. shipping_methods: name: "Name" + applies: "Active?" manage: "Manage Shipping Methods" create_button: "Create New Shipping Method" create_one_button: "Create One Now" @@ -3071,6 +3072,8 @@ en_GB: zone: "Zone" calculator: "Calculator" display: "Display" + both: "Both Checkout and Back office" + back_end: "Back office only" no_shipping_methods_found: "No shipping methods found" new: new_shipping_method: "New Shipping Method" @@ -3082,6 +3085,9 @@ en_GB: form: categories: "Categories" zones: "Zones" + both: "Both Checkout and Back office" + back_end: "Back office only" + deactivation_warning: "De-activating a shipping method can make the shipping method disappear from your list. Alternatively, you can hide a shipping method from the checkout page by setting the option 'Display' to 'back office only'." payment_methods: new: new_payment_method: "New Payment Method" @@ -3241,6 +3247,7 @@ en_GB: format: '%Y-%m-%d' js_format: 'yy-mm-dd' orders: + error_flash_for_unavailable_items: "An item in your basket has become unavailable. Please update the selected quantities." edit: login_to_view_order: "Please log in to view your order." bought: From daf9fab16d9711b48cc701dfea29b0067b2fc7d2 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Tue, 26 May 2020 23:59:48 +1000 Subject: [PATCH 4/6] Updating translations for config/locales/en_CA.yml --- config/locales/en_CA.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml index 07db8c348f..61545c87fc 100644 --- a/config/locales/en_CA.yml +++ b/config/locales/en_CA.yml @@ -31,6 +31,10 @@ en_CA: taken: "There's already an account for this email. Please login or reset your password." spree/order: no_card: There are no authorised credit cards available to charge + spree/credit_card: + attributes: + base: + card_expired: "has expired" order_cycle: attributes: orders_close_at: @@ -319,6 +323,7 @@ en_CA: show_n_more: Show %{num} more choose: "Choose..." please_select: Please select... + column_save_as_default: Save as Default columns: Columns actions: Actions viewing: "Viewing: %{current_view_name}" @@ -681,6 +686,7 @@ en_CA: ofn_uid_tip: The unique id used to identify the enterprise on Open Food Network shipping_methods: name: "Name" + applies: "Active?" manage: "Manage Shipping/Pick-Up Methods" create_button: "Create New Shipping Method" create_one_button: "Create One Now" @@ -859,6 +865,7 @@ en_CA: incoming: "Incoming" supplier: "Supplier" products: "Products" + receival_details: "Receival Details" fees: "Fees" save: "Save" save_and_next: "Save and Next" @@ -870,6 +877,7 @@ en_CA: distributor: "Distributor" products: "Products" tags: "Tags" + delivery_details: "Delivery Details" fees: "Fees" previous: "Previous" save: "Save" @@ -1167,7 +1175,11 @@ en_CA: signup: "signup" contact: "contact" require_customer_login: "Only approved customers can access this shop" + require_login_html: "If you're already an approved customer, %{login} or %{signup} to proceed." + require_login_2_html: "Want to start shopping here? Please %{contact} %{enterprise} and ask about joining." require_customer_html: "If you'd like to start shopping here, please %{contact}%{enterprise} to ask about joining." + select_oc: + select_oc_html: "Please 1choose when you want your order1, to see what products are available." card_could_not_be_updated: Card could not be updated card_could_not_be_saved: card could not be saved spree_gateway_error_flash_for_checkout: "There was a problem with your payment information: %{error}" @@ -1527,12 +1539,17 @@ en_CA: orders_changeable_orders_alert_html: This order has been confirmed, but you can make changes until %{oc_close}. products_clear: Clear products_showing: "Showing:" + products_results_for: "Results for" products_or: "or" products_and: "and" + products_filters_in: "in" products_with: with + products_search: "Search" products_filter_by: "Filter by" products_filter_selected: "selected" + products_filter_heading: "Filters" products_filter_clear: "Clear" + products_filter_done: "Done" products_loading: "Loading products..." products_updating_cart: "Updating cart..." products_cart_empty: "Cart empty" @@ -1543,6 +1560,8 @@ en_CA: products_update_error_msg: "Saving failed." products_update_error_data: "Save failed due to invalid data:" products_changes_saved: "Changes saved." + products_no_results_html: "Sorry, no results found for %{query}" + products_clear_search: "Clear search" search_no_results_html: "Sorry, no results found for %{query}. Try another search?" components_profiles_popover: "Profiles do not have a shopfront on the Open Food Network, but may have their own physical or online shop elsewhere" components_profiles_show: "Show profiles" @@ -1898,6 +1917,7 @@ en_CA: admin_enterprise_relationships_permits: "permits" admin_enterprise_relationships_seach_placeholder: "Search" admin_enterprise_relationships_button_create: "Create" + admin_enterprise_relationships_to: "to" admin_enterprise_groups: "Enterprise Groups" admin_enterprise_groups_name: "Name" admin_enterprise_groups_owner: "Owner" @@ -2303,6 +2323,10 @@ en_CA: resolve_errors: Please resolve the following errors more_items: "+ %{count} More" default_card_updated: Default Card Updated + cart: + add_to_cart_failed: > + There was a problem adding this product to the cart. Perhaps it has become + unavailable or the shop is closing admin: enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it." modals: @@ -3041,6 +3065,8 @@ en_CA: zone: "Zone" calculator: "Calculator" display: "Display" + both: "Both Checkout and Back office" + back_end: "Back office only" no_shipping_methods_found: "No shipping methods found" new: new_shipping_method: "New Shipping Method" @@ -3052,6 +3078,9 @@ en_CA: form: categories: "Categories" zones: "Zones" + both: "Both Checkout and Back office" + back_end: "Back office only" + deactivation_warning: "De-activating a shipping method can make the shipping method disappear from your list. Alternatively, you can hide a shipping method from the checkout page by setting the option 'Display' to 'back office only'." payment_methods: new: new_payment_method: "New Payment Method" @@ -3171,6 +3200,8 @@ en_CA: price: "Price" display_as: "Display As" display_name: "Display Name" + display_as_placeholder: 'eg. 2 kg' + display_name_placeholder: 'eg. Tomatoes' autocomplete: producer_name: "Producer" unit: "Unit" @@ -3209,6 +3240,7 @@ en_CA: format: '%Y-%m-%d' js_format: 'yy-mm-dd' orders: + error_flash_for_unavailable_items: "An item in your cart has become unavailable. Please update the selected quantities." edit: login_to_view_order: "Please log in to view your order." bought: From 8d3c8c62fba5771256542e9c0ad955f9a4d4bf47 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 27 May 2020 00:02:52 +1000 Subject: [PATCH 5/6] Updating translations for config/locales/en_CA.yml --- config/locales/en_CA.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml index 61545c87fc..8071cfb4a9 100644 --- a/config/locales/en_CA.yml +++ b/config/locales/en_CA.yml @@ -1213,7 +1213,7 @@ en_CA: menu_2_url: "/map" menu_3_title: "Producers" menu_3_url: "/producers" - menu_4_title: "Groups" + menu_4_title: "Markets" menu_4_url: "/groups" menu_5_title: "About" menu_5_url: "https://about.openfoodnetwork.ca" @@ -1360,7 +1360,7 @@ en_CA: brandstory_part6: "We all love food. Now we can love our food system too." learn_body: "Explore models, stories and resources to support you to develop your local business or organisation. Find training, events and other opportunities to learn from peers." learn_cta: "Get Inspired" - connect_body: "Search our full directories of producers, hubs and groups to find fair and sustainably produced products near you. List your business or organisation on the OFN so buyers can find you. Join the community to get advice and solve problems together." + connect_body: "Search our full directories of producers, hubs and markets to find fair and sustainably produced products near you. List your business or organisation on the OFN so buyers can find you. Join the community to get advice and solve problems together." connect_cta: "Go Exploring" system_headline: "Shopping - here's how it works." system_step1: "1. Search" @@ -1568,7 +1568,7 @@ en_CA: components_filters_nofilters: "No filters" components_filters_clearfilters: "Clear all filters" groups_title: Groups - groups_headline: Groups / regions + groups_headline: 'Markets / Regions ' groups_text: "Every producer is unique. Every business has something different to offer. Our groups are collectives of producers, hubs and distributors who share something in common like location, farmers market or philosophy. This makes your shopping experience easier. So explore our groups and have the curating done for you." groups_search: "Search name or keyword" groups_no_groups: "No groups found" From d2e46b85617b02ad968a245994901f2bc9b0d0d6 Mon Sep 17 00:00:00 2001 From: Transifex-Openfoodnetwork Date: Wed, 27 May 2020 00:32:12 +1000 Subject: [PATCH 6/6] Updating translations for config/locales/ca.yml --- config/locales/ca.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 30ff63509a..3336807d9e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -687,6 +687,7 @@ ca: ofn_uid_tip: L'identificador únic que s’utilitza per identificar l'organització a Open Food Network. shipping_methods: name: "Nom" + applies: "Actiu?" manage: "Gestiona els mètodes d'enviament" create_button: "Crea un nou mètode d'enviament" create_one_button: "Crea'n un ara" @@ -3071,6 +3072,8 @@ ca: zone: "Zona" calculator: "Calculadora" display: "Mostra" + both: "Ambdues, validació de comanda i administració" + back_end: "Només pàgina administració (back office) " no_shipping_methods_found: "No s’han trobat mètodes d’enviament" new: new_shipping_method: "Nou mètode d'enviament" @@ -3083,6 +3086,8 @@ ca: categories: "Categories" zones: "Zones" both: "Comandes com administració" + back_end: "Només pàgina administració (back office) " + deactivation_warning: "Desactivar un mètode d'enviament pot fer que desaparegui de la teva llista. Pots ocultar-lo de la pàgina de validació de comanda configurant l'opció \"Mostrar\" a \"només a la pàgina d'administració\" (back end)." payment_methods: new: new_payment_method: "Nou mètode de pagament" @@ -3242,6 +3247,7 @@ ca: format: '%d-% m-% Y' js_format: 'dd-mm-yy' orders: + error_flash_for_unavailable_items: "Un ítem del teu carret ja no està disponible. Sis plau actualitza les quantitats seleccionades." edit: login_to_view_order: "Si us plau inicia sessió per veure la teva comanda." bought: