kkoomin
f65ce82778
changed string into translation key & add 'infinity' key
2019-05-04 14:40:45 +01:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
luisramos0
d7596b4066
Merge branch 'master' into fix_rebase_error
2019-05-03 12:10:57 +01:00
Luis Ramos
3b2e614c57
Merge pull request #3734 from luisramos0/2-0-validate-distribution
...
Removing a variant from OC will prevent user with that variant in the cart from checking out
2019-05-02 16:12:41 +01:00
luisramos0
85cf4fa3e6
Merge branch 'master' into 2-0-stable-May2
2019-05-02 11:27:53 +01:00
Luis Ramos
edaf2479dc
Merge pull request #3741 from luisramos0/2-0-stable-Apr15
...
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
2019-05-02 11:26:54 +01:00
luisramos0
f0f08f7cd3
Update all locales with the latest Transifex translations
2019-05-02 11:22:37 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
luisramos0
3d420d5727
Merge branch 'master' into 2-0-stable-Apr15
2019-04-16 21:14:11 +01:00
Transifex-Openfoodnetwork
e07ae3d931
Updating translations for config/locales/en_BE.yml
2019-04-17 02:20:37 +10:00
Luis Ramos
67a7e26757
Merge pull request #3695 from luisramos0/2-0-emails-transl
...
[Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn
2019-04-16 13:44:24 +01:00
luisramos0
8f39a18ca3
Merge branch 'master' into 2-0-stable-Apr15
2019-04-15 11:46:31 +01:00
Transifex-Openfoodnetwork
1b01c44ce4
Updating translations for config/locales/es.yml
2019-04-15 19:12:19 +10:00
Transifex-Openfoodnetwork
10c917a693
Updating translations for config/locales/ca.yml
2019-04-15 17:08:06 +10:00
Transifex-Openfoodnetwork
418d80bdc0
Updating translations for config/locales/ca.yml
2019-04-15 17:05:00 +10:00
luisramos0
fce3d69345
Add flash and warning to the cart page when item becomes unavailable
2019-04-13 21:39:41 +01:00
Transifex-Openfoodnetwork
45ca63e751
Updating translations for config/locales/fr_BE.yml
2019-04-12 01:14:59 +10:00
Transifex-Openfoodnetwork
b6989c6d6e
Updating translations for config/locales/nl_BE.yml
2019-04-12 01:05:30 +10:00
Luis Ramos
ddd3443a86
Merge pull request #3659 from mkllnk/missing-translation
...
Fix "What's this?" on admin dashboard
2019-04-10 22:05:19 +01:00
Matt-Yorkley
e486a94fb4
Add missing translations in subscriptions
2019-04-10 12:16:31 +01:00
Transifex-Openfoodnetwork
029e8eb848
Updating translations for config/locales/de_DE.yml
2019-04-09 20:50:31 +10:00
Transifex-Openfoodnetwork
fde3d72a66
Updating translations for config/locales/en_GB.yml
2019-04-09 00:18:48 +10:00
Transifex-Openfoodnetwork
5e672dc7d4
Updating translations for config/locales/pt.yml
2019-04-08 21:03:32 +10:00
Pau Perez
860414fa31
Update locales with latest Transifex translations
2019-04-08 12:27:19 +02:00
Pau Pérez Fabregat
fa31ca5a95
Merge pull request #3686 from openfoodfoundation/transifex
...
Transifex
2019-04-08 12:23:36 +02:00
Transifex-Openfoodnetwork
f5ab89eb03
Updating translations for config/locales/it.yml
2019-04-06 07:38:45 +11:00
luisramos0
ecc60f3b61
Merge branch 'master' into 2-0-stable-Mar29
2019-04-05 15:47:46 +01:00
Transifex-Openfoodnetwork
231fa28713
Updating translations for config/locales/en_US.yml
2019-04-06 00:24:05 +11:00
Transifex-Openfoodnetwork
74b7418f59
Updating translations for config/locales/fr.yml
2019-04-05 04:39:15 +11:00
Transifex-Openfoodnetwork
545f2fefa4
Updating translations for config/locales/fr.yml
2019-04-05 04:36:07 +11:00
Transifex-Openfoodnetwork
8d69180c8c
Updating translations for config/locales/es.yml
2019-04-04 23:23:06 +11:00
Transifex-Openfoodnetwork
4b60a75eae
Updating translations for config/locales/ca.yml
2019-04-04 23:22:59 +11:00
luisramos0
cf3b2308e1
Fix translation problem in the subject of order confirmation emails
2019-04-04 12:55:36 +01:00
luisramos0
6e49cf9f87
Bring cancel email from spree so it gets the normal ofn style
2019-04-04 12:31:12 +01:00
Transifex-Openfoodnetwork
1874f55fa4
Updating translations for config/locales/pt.yml
2019-04-03 03:14:14 +11:00
Maikel Linke
8b6561addd
Add missing translation for order form in v2
...
I saw the following error on the 2-0-stable branch:
translation missing: en.spree.line_item_adjustments
In a pending PR I change all three translations in the view file to use
lazy lookup. This commit backports the addition to the locale so that it
can be translated via Transifex before we release v2.
2019-04-02 17:52:24 +11:00
luisramos0
527cfc1601
Merge branch 'master' into 2-0-stable-Mar29
2019-03-29 13:48:49 +00:00
Maikel
fed2b60743
Merge pull request #3644 from kevinchristianson/master
...
Fixed producer profile translation bug
2019-03-28 15:51:45 +11:00
Luis Ramos
4455073f6d
Merge pull request #3647 from luisramos0/fix-shipment-state-translation
...
Add missing translation key for order shipment state canceled
2019-03-27 13:02:14 +00:00
Maikel Linke
bcebb99967
Fix "What's this?" on admin dashboard
...
When a user has no enterprises, the admin dashboard displays a "What's
this?" hint in the right corner of the enterprises tab. The link text
and the tooltip were both broken (missing translation).
2019-03-27 11:04:08 +11:00
Transifex-Openfoodnetwork
a2f3110b06
Updating translations for config/locales/en_CA.yml
2019-03-26 03:33:01 +11:00
Transifex-Openfoodnetwork
e504783929
Updating translations for config/locales/fr_CA.yml
2019-03-26 03:06:18 +11:00
Transifex-Openfoodnetwork
a4bc739d48
Updating translations for config/locales/de_DE.yml
2019-03-25 16:40:06 +11:00
luisramos0
2c97eaa62e
Add missing translation key for order shipment state canceled
2019-03-24 15:33:14 +00:00
Transifex-Openfoodnetwork
b979a09478
Updating translations for config/locales/en_US.yml
2019-03-23 23:42:22 +11:00
Transifex-Openfoodnetwork
dc198b7b5d
Updating translations for config/locales/pt.yml
2019-03-23 23:28:43 +11:00
Usama
698c71f039
Fixed producer profile translation bug
2019-03-22 18:25:40 -05:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
Transifex-Openfoodnetwork
2ba10c416a
Updating translations for config/locales/nb.yml
2019-03-22 07:41:18 +11:00
Transifex-Openfoodnetwork
310b4a08b7
Updating translations for config/locales/fr.yml
2019-03-22 03:20:40 +11:00
