diff --git a/app/controllers/admin/variant_overrides_controller.rb b/app/controllers/admin/variant_overrides_controller.rb index e12b43825b..9fe5c9fc0b 100644 --- a/app/controllers/admin/variant_overrides_controller.rb +++ b/app/controllers/admin/variant_overrides_controller.rb @@ -12,6 +12,7 @@ module Admin def index; end def bulk_update + byebug # Ensure we're authorised to update all variant overrides @vo_set.collection.each { |vo| authorize! :update, vo } diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 56fac2a708..b7c5a59b6c 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -19,6 +19,8 @@ ar: shipping_category_id: "نوع الشحن" variant_unit: "وحدة النوع" variant_unit_name: "اسم وحدة النوع" + spree/credit_card: + base: "بطاقة ائتمان" order_cycle: orders_close_at: تاريخ الاغلاق errors: @@ -860,6 +862,11 @@ ar: cancel: "إلغاء" back_to_list: "العودة للقائمة" outgoing: + outgoing: "الصادر" + distributor: "الموزع" + products: "منتجات" + tags: "الاوسمة" + fees: "رسوم" previous: "السابق" save: "حفظ" save_and_back_to_list: "حفظ والعودة إلى القائمة" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 737c9ba7dc..35a2a9657a 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -19,6 +19,8 @@ ca: shipping_category_id: "Categoria d'enviament" variant_unit: "Unitat de la variant" variant_unit_name: "Nom de la unitat de la variant" + spree/credit_card: + base: "Targeta de crèdit" order_cycle: orders_close_at: Data de tancament errors: diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml index 82bc742e43..bfdacc350e 100644 --- a/config/locales/de_DE.yml +++ b/config/locales/de_DE.yml @@ -1784,13 +1784,13 @@ de_DE: address1_field_placeholder: "z.B. 123 Cranberry-Laufwerk" address1_field_error: "Bitte geben Sie eine Adresse an" address2_field: "Anschrift Zeile 2:" - suburb_field: "Vorort:" + suburb_field: "Ort:" suburb_field_placeholder: "z.B. Northcote" suburb_field_error: "Bitte geben Sie einen Vorort ein" postcode_field: "Postleitzahl:" postcode_field_placeholder: "z.B. 3070" postcode_field_error: "Postleitzahl erforderlich" - state_field: "Zustand:" + state_field: "Bundesland:" state_field_error: "Staat erforderlich" country_field: "Land:" country_field_error: "Bitte wähle ein Land" @@ -1809,8 +1809,8 @@ de_DE: yes_producer: "Ja, ich bin ein Produzent." no_producer: "Nein, ich bin kein Produzent" producer_field_error: "Bitte wählen Sie: Sind Sie ein Produzent?" - yes_producer_help: "Hersteller machen leckere Dinge zu essen und / oder zu trinken. Du bist ein Produzent, wenn du ihn anbaust, erziehst ihn, braue ihn, backe ihn, gähre ihn, melke ihn oder forme ihn." - no_producer_help: "Wenn Sie kein Produzent sind, sind Sie wahrscheinlich jemand, der Lebensmittel verkauft und verteilt. Sie könnten ein Hub, Coop, Einkaufsgruppe, Einzelhändler, Großhändler oder andere sein." + yes_producer_help: "Die Produzenten machen leckere Sachen zum Essen und / oder Trinken. Sie sind ein Produzent, wenn Sie anbauen, brauen, backen, fermentieren, melken oder sonst wie Lebenmittel produzieren." + no_producer_help: "Wenn Sie kein Produzent sind, sind Sie wahrscheinlich jemand, der Lebensmittel verkauft und verteilt. Sie könnten ein Foodhub, eine Coop, eine Einkaufsgruppe, Einzelhändler, ein Hofladen, Großhändler oder vergleichbares sein." create_profile: "Profil erstellen" about: title: "Über Uns" diff --git a/config/locales/en_AU.yml b/config/locales/en_AU.yml index 741661f508..ecc81b40ce 100644 --- a/config/locales/en_AU.yml +++ b/config/locales/en_AU.yml @@ -19,6 +19,8 @@ en_AU: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: @@ -699,6 +701,16 @@ en_AU: enable_subscriptions_false: "Disabled" enable_subscriptions_true: "Enabled" shopfront_message: "\"Home\" message" + shopfront_message_placeholder: > + Create your home page content to welcome customers and explain how people + can shop with you. + + Include details about your delivery and pick up options, how often you + open the shop for orders, and all the details your customers will need + to understand the process of buying from you. + + You can also include links to your newsletter sign up, so that people + can connect with you to hear when your next order cycle opens. shopfront_message_link_tooltip: "Insert / edit link" shopfront_message_link_prompt: "Please enter a URL to insert" shopfront_closed_message: "Shopfront Closed Message" @@ -860,6 +872,11 @@ en_AU: cancel: "Cancel" back_to_list: "Back To List" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + fees: "Fees" previous: "Previous" save: "Save" save_and_back_to_list: "Save and Back to List" diff --git a/config/locales/en_BE.yml b/config/locales/en_BE.yml index 51cf1d2479..7f6c05a7c3 100644 --- a/config/locales/en_BE.yml +++ b/config/locales/en_BE.yml @@ -19,6 +19,8 @@ en_BE: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: @@ -836,6 +838,11 @@ en_BE: next: "Next" cancel: "Cancel" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + fees: "Fees" previous: "Previous" save: "Save" cancel: "Cancel" diff --git a/config/locales/en_CA.yml b/config/locales/en_CA.yml index cb02b83181..193b756e57 100644 --- a/config/locales/en_CA.yml +++ b/config/locales/en_CA.yml @@ -19,6 +19,8 @@ en_CA: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: @@ -861,6 +863,11 @@ en_CA: cancel: "Cancel" back_to_list: "Back to List" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + fees: "Fees" previous: "Previous" save: "Save" save_and_back_to_list: "Save and Back to List" diff --git a/config/locales/en_DE.yml b/config/locales/en_DE.yml index 462ab3502f..8c81c87986 100644 --- a/config/locales/en_DE.yml +++ b/config/locales/en_DE.yml @@ -19,6 +19,8 @@ en_DE: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: @@ -844,6 +846,11 @@ en_DE: next: "Next" cancel: "Cancel" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + fees: "Fees" previous: "Previous" save: "Save" cancel: "Cancel" diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 78ab3801e2..dfa17eb46e 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -19,6 +19,8 @@ en_GB: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: diff --git a/config/locales/en_NZ.yml b/config/locales/en_NZ.yml index 8299a63b7d..15ad362a51 100644 --- a/config/locales/en_NZ.yml +++ b/config/locales/en_NZ.yml @@ -19,6 +19,8 @@ en_NZ: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: @@ -861,6 +863,11 @@ en_NZ: cancel: "Cancel" back_to_list: "Back To List" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + fees: "Fees" previous: "Previous" save: "Save" save_and_back_to_list: "Save and Back to List" diff --git a/config/locales/en_US.yml b/config/locales/en_US.yml index 1cb6cfdcb4..1e04a29f90 100644 --- a/config/locales/en_US.yml +++ b/config/locales/en_US.yml @@ -19,6 +19,8 @@ en_US: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close Date errors: @@ -608,7 +610,7 @@ en_US: desc_long: About Us desc_long_placeholder: Tell customers about yourself. This information appears on your public profile. business_details: - abn: Tax ID Number or EIN (optional) + abn: Tax ID, DUNS Number, or other business ID abn_placeholder: eg. 123456789 acn: Legal Business Name acn_placeholder: eg. Martin's Produce LLC @@ -861,6 +863,12 @@ en_US: cancel: "Cancel" back_to_list: "Back To List" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + delivery_details: "Delivery Details" + fees: "Fees" previous: "Previous" save: "Save" save_and_back_to_list: "Save and Back to List" @@ -1172,11 +1180,11 @@ en_US: invoice_column_price_without_taxes: "Total price (Excl. tax)" invoice_column_tax_rate: "Tax rate" invoice_tax_total: "Tax total:" - tax_invoice: "TAX INVOICE" + tax_invoice: "INVOICE" tax_total: "Total tax (%{rate}):" total_excl_tax: "Total (Excl. tax):" total_incl_tax: "Total (Incl. tax):" - abn: "Tax ID Number or EIN (optional)" + abn: "Tax ID, DUNS Number, or other business ID" acn: "Legal Business Name" invoice_issued_on: "Invoice issued on:" order_number: "Invoice number:" @@ -1809,7 +1817,7 @@ en_US: enterprise_long_desc: "Long Description" enterprise_long_desc_placeholder: "This is your opportunity to tell the story of your enterprise - what makes you different and wonderful? We'd suggest keeping your description to under 600 characters or 150 words." enterprise_long_desc_length: "%{num} characters / up to 600 recommended" - enterprise_abn: "Tax ID Number or EIN (optional)" + enterprise_abn: "Tax ID, DUNS Number, or other business ID" enterprise_abn_placeholder: "eg. 123456789" enterprise_acn: "Legal Business Name" enterprise_acn_placeholder: "eg. Justins Produce LLC" @@ -2888,6 +2896,12 @@ en_US: minimal_amount: "Minimal Amount" normal_amount: "Normal Amount" discount_amount: "Discount Amount" + no_images_found: "No Images Found" + new_image: "New Image" + filename: "Filename" + alt_text: "Alternative Text" + thumbnail: "Thumbnail" + back_to_images_list: "Back To Images List" email: Email account_updated: "Account updated!" email_updated: "The account will be updated once the new email is confirmed." @@ -2899,6 +2913,9 @@ en_US: zipcode: Zipcode weight: Weight (per lb) error_user_destroy_with_orders: "Users with completed orders may not be deleted" + cannot_create_payment_without_payment_methods: "You cannot create a payment for an order without any payment methods defined." + please_define_payment_methods: "Please define some payment methods first." + options: "Options" actions: update: "Update" errors: @@ -2930,27 +2947,53 @@ en_US: product_properties: index: inherits_properties_checkbox_hint: "Inherit properties from %{supplier}? (unless overridden above)" + add_product_properties: "Add Product Properties" + select_from_prototype: "Select From Prototype" properties: index: properties: "Properties" + new_property: "New Property" name: "Name" + presentation: "Presentation" + new: + new_property: "New Property" + edit: + editing_property: "Editing Property" + back_to_properties_list: "Back To Properties List" form: name: "Name" + presentation: "Presentation" return_authorizations: index: + new_return_authorization: "New Return Authorization" return_authorizations: "Return Authorizations" back_to_orders_list: "Back To Orders List" + rma_number: "RMA Number" status: "Status" amount: "Amount" cannot_create_returns: "Cannot create returns as this order has no shipped units." continue: "Continue" new: + new_return_authorization: "New Return Authorization" + back_to_return_authorizations_list: "Back To Return Authorization List" continue: "Continue" edit: + receive: "receive" are_you_sure: "Are you sure?" + return_authorization: "Return Authorization" form: product: "Product" + quantity_shipped: "Quantity Shipped" + quantity_returned: "Quantity Returned" + return_quantity: "Return Quantity" amount: "Amount" + rma_value: "RMA Value" + reason: "Reason" + stock_location: "Stock Location" + states: + authorized: "Authorized" + received: "Received" + canceled: "Canceled" orders: index: listing_orders: "Listing Orders" @@ -2958,6 +3001,7 @@ en_US: capture: "Capture" ship: "Ship" edit: "Edit" + order_not_updated: "The order could not be updated" note: "Note" first: "First" last: "Last" @@ -2977,9 +3021,11 @@ en_US: email: "Customer E-mail" invoice: issued_on: "Issued on" - tax_invoice: "TAX INVOICE" + tax_invoice: "INVOICE" code: "Code" from: "From" + to: "Bill to" + shipping: "Shipping" form: distribution_fields: title: "Distribution" @@ -3140,12 +3186,22 @@ en_US: index: sku: "SKU" price: "Price" + options: "Options" no_results: "No results" + to_add_variants_you_must_first_define: "To add variants, you must first define" option_types: "Option Types" + option_values: "Option Values" + and: "and" + new_variant: "New Variant" + show_active: "Show Active" + show_deleted: "Show Deleted" + new: + new_variant: "New Variant" form: sku: "SKU" price: "Price" display_as: "Display As" + display_name: "Display Name" autocomplete: producer_name: "Producer" unit: "Unit" @@ -3291,3 +3347,19 @@ en_US: allow_charges?: "Allow Charges?" localized_number: invalid_format: has an invalid format. Please enter a number. + api: + invalid_api_key: "Invalid API key (%{key}) specified." + unauthorized: "You are not authorized to perform that action." + invalid_resource: "Invalid resource. Please fix errors and try again." + resource_not_found: "The resource you were looking for could not be found." + access: "API Access" + key: "Key" + clear_key: "Clear key" + regenerate_key: "Regenerate Key" + no_key: "No key" + generate_key: "Generate API key" + key_generated: "Key generated" + key_cleared: "Key cleared" + shipment: + cannot_ready: "Cannot ready shipment." + invalid_taxonomy_id: "Invalid taxonomy id." diff --git a/config/locales/en_ZA.yml b/config/locales/en_ZA.yml index 95a6626d62..71e4279ab3 100644 --- a/config/locales/en_ZA.yml +++ b/config/locales/en_ZA.yml @@ -19,6 +19,8 @@ en_ZA: shipping_category_id: "Shipping Category" variant_unit: "Variant Unit" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Credit Card" order_cycle: orders_close_at: Close date errors: @@ -840,6 +842,11 @@ en_ZA: next: "Next" cancel: "Cancel" outgoing: + outgoing: "Outgoing" + distributor: "Distributor" + products: "Products" + tags: "Tags" + fees: "Fees" previous: "Previous" save: "Save" cancel: "Cancel" diff --git a/config/locales/es.yml b/config/locales/es.yml index d7cfd0eef1..ab12b1328f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -19,6 +19,8 @@ es: shipping_category_id: "Categoría de envío" variant_unit: "Unidad Variante" variant_unit_name: "Nombre de la unidad de la variante" + spree/credit_card: + base: "Tarjeta de crédito" order_cycle: orders_close_at: Fecha de cierre errors: @@ -845,6 +847,11 @@ es: next: "Siguiente" cancel: "Cancelar" outgoing: + outgoing: "Saliente" + distributor: "Distribuidora" + products: "Productos" + tags: "Tags" + fees: "Comisiones" previous: "Anterior" save: "Guardar" cancel: "Cancelar" diff --git a/config/locales/fr_BE.yml b/config/locales/fr_BE.yml index cebb76a300..8ca1872694 100644 --- a/config/locales/fr_BE.yml +++ b/config/locales/fr_BE.yml @@ -19,6 +19,8 @@ fr_BE: shipping_category_id: "Catégorie de livraison" variant_unit: "Unité de variante" variant_unit_name: "Nom de la variante" + spree/credit_card: + base: "Carte de crédit" order_cycle: orders_close_at: Date de fermeture errors: @@ -861,6 +863,11 @@ fr_BE: cancel: "Annuler" back_to_list: "Retour à la liste." outgoing: + outgoing: "Produits sortants (mis en vente par/via un ou plusieurs comptoir·s)" + distributor: "Distributeur·trice" + products: "Produits" + tags: "Tags" + fees: "Commission" previous: "Précédent" save: "Sauvergarder" save_and_back_to_list: "Sauver et retour à la liste" @@ -1131,7 +1138,7 @@ fr_BE: checkout: "Passer la commande" already_ordered_products: "Déjà commandé dans ce cycle de vente" register_call: - selling_on_ofn: "Intéressé à participer à Open Food Network?" + selling_on_ofn: "Intéressé·e à vendre sur Open Food Network?" register: "Démarrez ici" footer: footer_secure: "Fiable et sécurisé." diff --git a/config/locales/fr_CA.yml b/config/locales/fr_CA.yml index c9c76894c2..cf300ce168 100644 --- a/config/locales/fr_CA.yml +++ b/config/locales/fr_CA.yml @@ -19,6 +19,8 @@ fr_CA: shipping_category_id: "Condition de transport" variant_unit: "Unité" variant_unit_name: "Unité de la variante" + spree/credit_card: + base: "Carte de crédit" order_cycle: orders_close_at: Date de fermeture errors: @@ -863,6 +865,11 @@ fr_CA: cancel: "Annuler" back_to_list: "Retour à la liste" outgoing: + outgoing: "Produits sortants (mis en vente par/via un ou plusieurs hubs)" + distributor: "Hub-distributeur" + products: "Produits" + tags: "Tags" + fees: "Commissions" previous: "Précédent" save: "Enregistrer" save_and_back_to_list: "Sauvegarder et suivant" diff --git a/config/locales/it.yml b/config/locales/it.yml index a0f7731518..67f67b0a28 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -19,6 +19,8 @@ it: shipping_category_id: "Categoria di spedizione" variant_unit: "Unità Variante" variant_unit_name: "Nome Unità Variante" + spree/credit_card: + base: "Carta di Credito" order_cycle: orders_close_at: Data chiusura errors: @@ -862,6 +864,11 @@ it: cancel: "Annulla" back_to_list: "Indietro alla lista" outgoing: + outgoing: "In uscita" + distributor: "Distributore" + products: "Prodotti" + tags: "Tag" + fees: "Tariffe" previous: "Precedente" save: "Salva" save_and_back_to_list: "Salva e torna alla lista" diff --git a/config/locales/nb.yml b/config/locales/nb.yml index e7d33d52a0..471207ccca 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -19,6 +19,8 @@ nb: shipping_category_id: "Leveringskategori" variant_unit: "Variant Enhet" variant_unit_name: "Enhetsnavn Variant" + spree/credit_card: + base: "Kredittkort" order_cycle: orders_close_at: Lukkedato errors: @@ -861,6 +863,11 @@ nb: cancel: "Avbryt" back_to_list: "Tilbake til Listen" outgoing: + outgoing: "Utgående" + distributor: "Distributør" + products: "Produkter" + tags: "Merkelapper" + fees: "Avgifter" previous: "Tidligere" save: "Lagre" save_and_back_to_list: "Lagre og Tilbake til Listen" diff --git a/config/locales/nl_BE.yml b/config/locales/nl_BE.yml index 1ea003122e..d6d40e6fdc 100644 --- a/config/locales/nl_BE.yml +++ b/config/locales/nl_BE.yml @@ -3,7 +3,7 @@ nl_BE: activerecord: attributes: enterprise_fee: - fee_type: Sprookjesachtig type + fee_type: Soort commissie spree/order: payment_state: Status Betaling shipment_state: Status Verzending @@ -19,6 +19,8 @@ nl_BE: shipping_category_id: "Verzendcategorie" variant_unit: "Eénheid" variant_unit_name: "Variant Unit Name" + spree/credit_card: + base: "Kredietkaart" order_cycle: orders_close_at: Sluitingsdatum errors: @@ -839,6 +841,11 @@ nl_BE: next: "Volgende" cancel: "Annuleren" outgoing: + outgoing: "Uitgaande" + distributor: "Distributeur" + products: "Producten" + tags: "Tags" + fees: "Vergoedingen" previous: "Voorgaande" save: "Save" cancel: "Annuleren" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b9035d7f10..b5444331ec 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -17,6 +17,8 @@ pt: primary_taxon: "Categoria de Produto" supplier: "Fornecedor" variant_unit: "Unidade da Variante" + spree/credit_card: + base: "Cartão de Crédito" order_cycle: orders_close_at: Data de fecho errors: @@ -826,6 +828,11 @@ pt: next: "Seguinte" cancel: "Cancelar" outgoing: + outgoing: "Saída" + distributor: "Distribuidor" + products: "Produtos" + tags: "Etiquetas" + fees: "Taxas" previous: "Anterior" save: "Guardar" cancel: "Cancelar" diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml index 87be993fe0..d5dbc46d8d 100644 --- a/config/locales/pt_BR.yml +++ b/config/locales/pt_BR.yml @@ -1575,7 +1575,7 @@ pt_BR: groups_signup_motivation9: 'Se você precisa de recursos, nós te conectamos a uma rede global de parceiros. ' groups_signup_pricing: Conta de Grupos groups_signup_studies: Estudos de Caso - groups_signup_contact: Pronto para discutir? + groups_signup_contact: Pronto para conversar? groups_signup_contact_text: "Entre em contato para descobrir o que a OFB pode fazer por você" groups_signup_detail: "Aqui está o detalhe. " login_invalid: "E-mail ou senha inválidos" diff --git a/config/locales/sv.yml b/config/locales/sv.yml index ae32c53f2e..ca90a48659 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -495,6 +495,11 @@ sv: next: "Näst" cancel: "Avbryt" outgoing: + outgoing: "Utgående" + distributor: "Distributör" + products: "Produkter" + tags: "Taggar" + fees: "Avgifter" cancel: "Avbryt" exchange_form: pickup_instructions_placeholder: "Instruktioner för upphämtning" diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 8260ea4341..b36a8da76b 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -19,6 +19,8 @@ tr: shipping_category_id: "Nakliye Kategorisi" variant_unit: "Varyant Birimi" variant_unit_name: "Varyant Birim Adı" + spree/credit_card: + base: "Kredi kartı" order_cycle: orders_close_at: Bitiş tarihi errors: @@ -858,6 +860,11 @@ tr: cancel: "İptal et" back_to_list: "Listeye geri dön" outgoing: + outgoing: "Giden" + distributor: "Dağıtımcı" + products: "Ürünler" + tags: "Etiketler" + fees: "Ücretler" previous: "Önceki" save: "Kaydet" save_and_back_to_list: "Kaydet ve Listeye Dön"