Luis Ramos
fe6bcb5093
Add de-activation warning to payment methods edit page
2020-05-28 19:50:58 +01:00
Luis Ramos
26f1dfb080
Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method
2020-05-28 19:50:58 +01:00
Luis Ramos
83edfbd1dd
Merge pull request #5266 from luchiago/improve-order-cancellation-email
...
Improve order cancellation email
2020-05-28 19:48:26 +01:00
Transifex-Openfoodnetwork
29f266d3a5
Updating translations for config/locales/tr.yml
2020-05-28 23:17:00 +10:00
Transifex-Openfoodnetwork
c428b2f133
Updating translations for config/locales/tr.yml
2020-05-28 23:07:06 +10:00
Matt-Yorkley
ea7a2c91ee
Update all locales with the latest Transifex translations
2020-05-28 13:12:12 +02:00
Matt-Yorkley
2ae84ad710
Merge pull request #5491 from openfoodfoundation/transifex
...
Transifex
2020-05-28 13:08:36 +02:00
Transifex-Openfoodnetwork
d2e46b8561
Updating translations for config/locales/ca.yml
2020-05-27 00:32:12 +10:00
Transifex-Openfoodnetwork
8d3c8c62fb
Updating translations for config/locales/en_CA.yml
2020-05-27 00:02:52 +10:00
Transifex-Openfoodnetwork
daf9fab16d
Updating translations for config/locales/en_CA.yml
2020-05-26 23:59:48 +10:00
Robin Klaus
50a63139e3
Changed translation syntax to normal t() call and lazy lookup.
2020-05-26 15:14:26 +10:00
Steve Roberts
d4a256fcca
Add support for an env var to override DB port
2020-05-26 11:04:42 +10:00
Transifex-Openfoodnetwork
d9d221e4f3
Updating translations for config/locales/en_GB.yml
2020-05-25 18:46:48 +10:00
Transifex-Openfoodnetwork
5de3fbba1e
Updating translations for config/locales/en_FR.yml
2020-05-24 19:14:49 +10:00
Transifex-Openfoodnetwork
ed27ed32e3
Updating translations for config/locales/fr.yml
2020-05-24 19:14:25 +10:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Kristina Lim
cf534237cd
Update all locales with the latest Transifex translations
2020-05-23 01:51:23 +08:00
Pau Pérez Fabregat
b804036822
Merge pull request #5469 from openfoodfoundation/transifex
...
Transifex
2020-05-22 18:24:14 +02:00
Transifex-Openfoodnetwork
88ab5c2dd7
Updating translations for config/locales/fr.yml
2020-05-22 23:31:48 +10:00
Transifex-Openfoodnetwork
466bbe52ae
Updating translations for config/locales/en_FR.yml
2020-05-22 23:29:08 +10:00
Luis Ramos
9a71ffc093
Merge pull request #5438 from Matt-Yorkley/cart-stock-ux
...
Cart stock UX
2020-05-22 14:21:16 +01:00
Luis Ramos
b7c601abcd
Merge pull request #5424 from luisramos0/ship_method_warning
...
Add warning to enterprise Shipping Method list and to Shipping method edit page
2020-05-22 11:24:12 +01:00
Transifex-Openfoodnetwork
adb3c9e56f
Updating translations for config/locales/en_NZ.yml
2020-05-22 00:22:33 +10:00
Luis Ramos
35b249f40d
Merge pull request #5390 from rmklaus12/fix-enyml-keys
...
Fix translation keys in en.yml file from previous conflicting PRs
2020-05-21 10:56:01 +01:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Luis Ramos
d017c0b701
Change base translation from applies to active so the naming is consistent: ship methods can be active or inactive for an enterprises which means they can be linked or not to that enterprise
2020-05-21 10:45:58 +01:00
Transifex-Openfoodnetwork
8bb47ef467
Updating translations for config/locales/en_NZ.yml
2020-05-21 16:43:58 +10:00
Maikel
da55956a6e
Merge pull request #5392 from luisramos0/ship_method_bo
...
Make "backoffice only" ship methods work and remove option "frontoffice only"
2020-05-21 10:16:15 +10:00
Matt-Yorkley
6b3a7228ce
Update flash message with instruction to update the quantities
2020-05-20 09:43:29 +02:00
Transifex-Openfoodnetwork
8387c71b6e
Updating translations for config/locales/tr.yml
2020-05-20 15:55:52 +10:00
Robin Klaus
16f2c8d7d1
Removed 5 keys per change request in ref to pr5425
2020-05-20 14:13:42 +10:00
Robin Klaus
a0334953db
Added 14 translation keys for PayPalExpress payment method
2020-05-18 17:06:07 +10:00
Transifex-Openfoodnetwork
d2b8b5e888
Updating translations for config/locales/pt_BR.yml
2020-05-18 05:14:19 +10:00
Lucas Hiago
5d286cb349
Add i18n of new symbols for order cancel mail
2020-05-15 10:59:56 -03:00
Transifex-Openfoodnetwork
4f14d7910a
Updating translations for config/locales/en_IE.yml
2020-05-15 23:04:12 +10:00
Transifex-Openfoodnetwork
78db7e0e5f
Updating translations for config/locales/en_GB.yml
2020-05-15 17:36:21 +10:00
Maikel Linke
51feef83ca
Update translations from Transifex
2020-05-15 14:10:36 +10:00
Maikel
90baec0e2c
Merge pull request #5393 from openfoodfoundation/transifex
...
Transifex
2020-05-15 13:53:56 +10:00
Transifex-Openfoodnetwork
bd8b3f11d1
Updating translations for config/locales/en_FR.yml
2020-05-14 05:42:38 +10:00
Transifex-Openfoodnetwork
937c981dd8
Updating translations for config/locales/fr.yml
2020-05-14 05:41:55 +10:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Transifex-Openfoodnetwork
9b7de5ee6e
Updating translations for config/locales/en_NZ.yml
2020-05-13 19:27:55 +10:00
Luis Ramos
ef2d7f9485
Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
...
[mobile ux] Merge search and filter epic to master
2020-05-13 08:59:32 +01:00
Luis Ramos
dcd097a22e
Merge pull request #5231 from pacodelaluna/add-dfc-provider-engine
...
Add DFC Provider engine
2020-05-11 20:27:21 +01:00
Matt-Yorkley
dee793a392
Change join word between the two filter sets to be "and", to match the actual logic
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7e6683581a
Remove full stop from translation
...
This doesn't fit with the new syntax structure
2020-05-10 09:44:12 +02:00
Matt-Yorkley
2964ec138d
Update display of join words in filters list and rearrange code a bit for clarity
...
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.
$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4
Update "no results" styling
2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465
Update styling on search feedback bar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0
Add missing translation key
2020-05-10 09:44:11 +02:00
