Skip to content
This repository was archived by the owner on Aug 30, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"general": {
"previous_product_html": "← Vorheriger Artikel",
"next_product_html": "Nächster Artikel →",
"from": "Von"
"from_text_html": "Von {{ price }}"
},
"product": {
"sold_out": "Ausverkauft",
Expand Down
2 changes: 1 addition & 1 deletion locales/en.default.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"general": {
"previous_product_html": "← Previous Product",
"next_product_html": "Next Product →",
"from": "From"
"from_text_html": "From {{ price }}"
},
"product": {
"sold_out": "Sold Out",
Expand Down
2 changes: 1 addition & 1 deletion locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"general": {
"previous_product_html": "← Producto anterior",
"next_product_html": "Siguiente producto →",
"from": "De"
"from_text_html": "De {{ price }}"
},
"product": {
"sold_out": "Agotado",
Expand Down
2 changes: 1 addition & 1 deletion locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"general": {
"previous_product_html": "← Produit précédent",
"next_product_html": "Produit suivant →",
"from": "À partir de"
"from_text_html": "À partir de {{ price }}"
},
"product": {
"sold_out": "Épuisé",
Expand Down
2 changes: 1 addition & 1 deletion locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"general": {
"previous_product_html": "← Produto anterior",
"next_product_html": "Próximo produto →",
"from": "A partir de"
"from_text_html": "A partir de {{ price }}"
},
"product": {
"sold_out": "Esgotado",
Expand Down
2 changes: 1 addition & 1 deletion locales/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"general": {
"previous_product_html": "← Produto Anterior",
"next_product_html": "Produto Seguinte →",
"from": "Desde"
"from_text_html": "Desde {{ price }}"
},
"product": {
"sold_out": "Esgotado",
Expand Down
8 changes: 6 additions & 2 deletions snippets/product-grid-item.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@
{{ product.price | money }}
{% endif %}
{% else %}
{% if product.price_varies %}{{ 'products.general.from' | t }}{% endif %}
{{ product.price | money }}
{% if product.price_varies %}
{% assign price = product.price | money %}
{{ 'products.general.from_text_html' | t: price: price }}
{% else %}
{{ product.price | money }}
{% endif %}
{% endif %}
{% if sold_out %}
<br><strong>{{ 'products.product.sold_out' | t }}</strong>
Expand Down
3 changes: 2 additions & 1 deletion snippets/social-meta-tags.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
<meta name="twitter:image:width" content="240">
<meta name="twitter:image:height" content="240">
<meta name="twitter:label1" content="Price">
<meta name="twitter:data1" content="{% if product.price_varies %}From {% endif %}{{ product.price | money_with_currency | strip_html | escape }}">
{% assign price = product.price | money_with_currency | strip_html | escape %}
<meta name="twitter:data1" content="{% if product.price_varies %}{{ 'products.general.from_text_html' | t: price: price }}{% else %}{{ price }}{% endif %}">
{% if product.vendor != blank %}
<meta name="twitter:label2" content="Brand">
<meta name="twitter:data2" content="{{ product.vendor | escape }}">
Expand Down
8 changes: 6 additions & 2 deletions templates/collection.list.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,12 @@
{{ product.price | money }}
{% endif %}
{% else %}
{% if product.price_varies %}{{ 'products.general.from' | t }}{% endif %}
{{ product.price | money }}
{% if product.price_varies %}
{% assign price = product.price | money %}
{{ 'products.general.from_text_html' | t: price: price }}
{% else %}
{{ product.price | money }}
{% endif %}
{% endif %}
{% if sold_out %}
<br><strong>{{ 'products.product.sold_out' | t }}</strong>
Expand Down
16 changes: 12 additions & 4 deletions templates/search.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,12 @@
<span itemprop="price">{{ item.price | money }}</span>
{% endif %}
{% else %}
{% if item.price_varies %}{{ 'products.general.from' | t }}{% endif %}
<span itemprop="price">{{ item.price | money }}</span>
{% if item.price_varies %}
{% assign price = item.price | money %}
<span itemprop="price">{{ 'products.general.from_text_html' | t: price: price }}</span>
{% else %}
<span itemprop="price">{{ item.price | money }}</span>
{% endif %}
{% endif %}
{% if sold_out %}
<br><strong>{{ 'products.product.sold_out' | t }}</strong>
Expand Down Expand Up @@ -141,8 +145,12 @@
<span itemprop="price">{{ item.price | money }}</span>
{% endif %}
{% else %}
{% if item.price_varies %}{{ 'products.general.from' | t }}{% endif %}
<span itemprop="price">{{ item.price | money }}</span>
{% if item.price_varies %}
{% assign price = item.price | money %}
<span itemprop="price">{{ 'products.general.from_text_html' | t: price: price }}</span>
{% else %}
<span itemprop="price">{{ item.price | money }}</span>
{% endif %}
{% endif %}
{% if sold_out %}
<br><strong>{{ 'products.product.sold_out' | t }}</strong>
Expand Down