raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-20 04:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change "&" to "and"

Browse Source 
There are very few places where ampersands are appropriate.

Minor typo in footer.
This commit is contained in:
Paul Mackay
2016-02-09 10:01:51 +00:00
parent fb7fb62f79
commit 50c657133a
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/shared/_footer.html.haml
View File

@@ -150,7 +150,7 @@
= t :footer_legal_tos
|
= t :footer_legal_visit
%a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank"} Github
%a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank"} GitHub
%p.text-small
= t :footer_legal_text_html, {content_license: link_to('CC BY-SA 3.0', 'https://creativecommons.org/licenses/by-sa/3.0/'), code_license: link_to('AGPL 3', 'https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)')}

6
config/locales/en-GB.yml
View File

@@ -129,7 +129,7 @@ en-GB:
footer_join_partners: "Food systems partners"
footer_legal_call: "Read our"
footer_legal_tos: "Terms & conditions"
footer_legal_tos: "Terms and conditions"
footer_legal_visit: "Find us on"
footer_legal_text_html: "Open Food Network is a free and open source software platform. Our content is licensed with %{content_license} and our code with %{code_license}."
@@ -355,7 +355,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
modal_how: "How it works"
modal_how_shop: Shop the Open Food Network
modal_how_shop_explained: Search for a food hub near you to start shopping! You can expand each food hub to see what kinds of goodies are available, and click through to start shopping. (You can only shop one food hub at a time.)
modal_how_pickup: Pick-ups, delivery & shipping costs
modal_how_pickup: Pick-ups, delivery and shipping costs
modal_how_pickup_explained: Some food hubs deliver to your door, while others require you to pick-up your purchases. You can see which options are available on the homepage, and select which you'd like at the shopping and check-out pages. Delivery will cost more, and pricing differs from hub-to-hub. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected.
modal_how_more: Learn more
modal_how_more_explained: "If you want to learn more about the Open Food Network, how it works, and get involved, check out:"
@@ -432,7 +432,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
orders_edit_checkout: Checkout
orders_form_empty_cart: "Empty cart"
orders_form_subtotal: Produce subtotal
orders_form_admin: Admin & handling
orders_form_admin: Admin and handling
orders_form_total: Total
orders_oc_expired_headline: Orders have closed for this order cycle
orders_oc_expired_text: "Sorry, orders for this order cycle closed %{time} ago! Please contact your hub directly to see if they can accept late orders."

8
config/locales/en.yml
View File

@@ -168,7 +168,7 @@ en:
footer_join_partners: "Food systems partners"
footer_legal_call: "Read our"
footer_legal_tos: "Terms & conditions"
footer_legal_tos: "Terms and conditions"
footer_legal_visit: "Find us on"
footer_legal_text_html: "Open Food Network is a free and open source software platform. Our content is licensed with %{content_license} and our code with %{code_license}."
@@ -396,7 +396,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
modal_how: "How it works"
modal_how_shop: Shop the Open Food Network
modal_how_shop_explained: Search for a food hub near you to start shopping! You can expand each food hub to see what kinds of goodies are available, and click through to start shopping. (You can only shop one food hub at a time.)
modal_how_pickup: Pick-ups, delivery & shipping costs
modal_how_pickup: Pick-ups, delivery and shipping costs
modal_how_pickup_explained: Some food hubs deliver to your door, while others require you to pick-up your purchases. You can see which options are available on the homepage, and select which you'd like at the shopping and check-out pages. Delivery will cost more, and pricing differs from hub-to-hub. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected.
modal_how_more: Learn more
modal_how_more_explained: "If you want to learn more about the Open Food Network, how it works, and get involved, check out:"
@@ -473,7 +473,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
orders_edit_checkout: Checkout
orders_form_empty_cart: "Empty cart"
orders_form_subtotal: Produce subtotal
orders_form_admin: Admin & handling
orders_form_admin: Admin and handling
orders_form_total: Total
orders_oc_expired_headline: Orders have closed for this order cycle
orders_oc_expired_text: "Sorry, orders for this order cycle closed %{time} ago! Please contact your hub directly to see if they can accept late orders."
@@ -631,7 +631,7 @@ Please follow the instructions there to make your enterprise visible on the Open
registration_type_producer: "Yes, I'm a producer"
registration_type_no_producer: "No, I'm not a producer"
registration_type_error: "Please choose one. Are you are producer?"
registration_type_producer_help: "Producers make yummy things to eat &/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it."
registration_type_producer_help: "Producers make yummy things to eat and/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it."
registration_type_no_producer_help: "If you’re not a producer, you’re probably someone who sells and distributes food. You might be a hub, coop, buying group, retailer, wholesaler or other."
create_profile: "Create Profile"
registration_images_headline: "Thanks!"

6
config/locales/fr.yml
View File

@@ -14,7 +14,7 @@ fr:
title: Open Food France
welcome_to: 'Bienvenue sur '
search_by_name: Recherche pas nom ou région...
producers: Producteurs & hubs
producers: Producteurs et hubs
producers_join: Les producteurs et autres hubs basés en France sont invités à rejoindre Open Food France.
charges_sales_tax: Soumis à la TVA?
print_invoice: "Imprimer la facture"
@@ -133,7 +133,7 @@ fr:
footer_join_groups: "Inscription groupes"
footer_join_partners: "Partenaires"
footer_legal_call: "Lire nos"
footer_legal_tos: "Termes & conditions"
footer_legal_tos: "Termes et conditions"
footer_legal_visit: "Nous trouver sur"
footer_legal_text_html: "Open Food Network est une plateforme logicielle open source, libre et gratuite. Nos données sont protégées sous licence %{content_license} et notre code sous %{code_license}."
home_shop: Faire mes courses
@@ -401,7 +401,7 @@ fr:
orders_edit_checkout: Régler ma commande
orders_form_empty_cart: "Vider le panier"
orders_form_subtotal: Sous-total
orders_form_admin: Admin & opérations
orders_form_admin: Admin et opérations
orders_form_total: Total
orders_oc_expired_headline: Les commandes ne sont plus possibles pour ce cycle de vente.
orders_oc_expired_text: "Désolé, les commandes pour ce cycle de vente ont été clôturées il y a %{time}! Veuillez contacter directement le hub pour voir s'il accepte les commandes tardives."

2
config/locales/nb.yml
View File

@@ -133,7 +133,7 @@ nb:
footer_join_groups: "Bli med som Gruppe"
footer_join_partners: "Samarbeidspartnere"
footer_legal_call: "Les våre"
footer_legal_tos: "Vilkår & betingelser"
footer_legal_tos: "Vilkår og betingelser"
footer_legal_visit: "Finn oss på"
footer_legal_text_html: "Open Food Network er en plattform med fri og åpen kildekode. Vårt innhold er lisensiert med %{content_license} og vår kode med %{code_license}."
home_shop: Handle nå