Matt-Yorkley
77eaebc2a7
Merge pull request #5888 from andrewpbrett/imperial-auto-units
...
Allow US units on products/variants
2020-09-17 15:04:15 +02:00
Matt-Yorkley
3ececb04c5
Update all locales with the latest Transifex translations
2020-09-17 13:33:53 +01:00
Matt-Yorkley
0aa515101b
Merge pull request #6015 from openfoodfoundation/transifex
...
Transifex
2020-09-17 14:31:41 +02:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f061545a92
Merge pull request #5995 from andresgutgon/fix/datetime-picker-ui-pick-the-right-translations-on-order-cycles
...
Fix date time picker translations on Order cycles screen
2020-09-17 11:50:37 +01:00
Transifex-Openfoodnetwork
875eb292be
Updating translations for config/locales/ar.yml
2020-09-17 08:42:12 +10:00
Transifex-Openfoodnetwork
7fe876266e
Updating translations for config/locales/es_CO.yml
2020-09-16 23:21:34 +10:00
Transifex-Openfoodnetwork
a367c3720c
Updating translations for config/locales/en_US.yml
2020-09-16 10:21:50 +10:00
Luis Ramos
6eb43053e9
Merge pull request #5925 from luisramos0/spree_core_user
...
[Bye bye spree] Bring classes related to users to OFN
2020-09-15 17:13:27 +01:00
Transifex-Openfoodnetwork
d86b879972
Updating translations for config/locales/nb.yml
2020-09-15 20:46:33 +10:00
Transifex-Openfoodnetwork
fd339488e6
Updating translations for config/locales/es.yml
2020-09-15 20:38:08 +10:00
Transifex-Openfoodnetwork
b6f5eab6e1
Updating translations for config/locales/ca.yml
2020-09-15 20:37:51 +10:00
Transifex-Openfoodnetwork
f32d8e2678
Updating translations for config/locales/en_GB.yml
2020-09-13 04:29:16 +10:00
Transifex-Openfoodnetwork
a9a05debba
Updating translations for config/locales/en_CA.yml
2020-09-13 02:30:11 +10:00
Transifex-Openfoodnetwork
b9f6dc6de5
Updating translations for config/locales/en_FR.yml
2020-09-12 00:25:49 +10:00
Transifex-Openfoodnetwork
811985cf0f
Updating translations for config/locales/fr.yml
2020-09-12 00:25:36 +10:00
Maikel Linke
e82aa0c89a
Update translations
2020-09-11 15:25:52 +10:00
Maikel
7317347fd6
Merge pull request #6012 from openfoodfoundation/transifex
...
Transifex
2020-09-11 15:25:04 +10:00
Maikel
c5c542069f
Merge pull request #5951 from mkllnk/5785-js-error-reporting
...
5785 Notify Bugsnag when sending card to Stripe fails during checkout
2020-09-11 15:12:47 +10:00
Transifex-Openfoodnetwork
f501d48caa
Updating translations for config/locales/fr.yml
2020-09-11 01:54:06 +10:00
Pau Pérez Fabregat
7df2759475
Merge pull request #5907 from Matt-Yorkley/data-cleanup
...
Data cleanup
2020-09-10 17:06:20 +02:00
Transifex-Openfoodnetwork
76aebf329e
Updating translations for config/locales/ar.yml
2020-09-10 02:13:08 +10:00
Transifex-Openfoodnetwork
3da14233bf
Updating translations for config/locales/en_US.yml
2020-09-08 02:55:31 +10:00
andresgutgon
d1331ac78a
Fix datetime picker translations on Order cycles screen
...
So the thing is we initialize jQuery plugin on `admin/util.js.erb` but
then we override those defaults on order_cycles.js.erb.coffe. Now both
plugin initializations use the same defaults. Also added 3 missing
translations for `Done`, `Now` and `Time` copies on that timepicker popover
2020-09-06 13:43:35 +02:00
Transifex-Openfoodnetwork
61dad61ef7
Updating translations for config/locales/en_GB.yml
2020-09-05 02:37:15 +10:00
Luis Ramos
60e241b2c8
Merge pull request #5984 from openfoodfoundation/transifex
...
Transifex
2020-09-04 17:19:37 +01:00
Pau Perez
4499bc7313
Do not require view overrides
...
View overrides were removed long ago, so no need to require an empty
list.
The next step will be class decorators.
2020-09-04 13:27:38 +02:00
Transifex-Openfoodnetwork
42d90465b1
Updating translations for config/locales/fr_CA.yml
2020-09-04 03:21:50 +10:00
Transifex-Openfoodnetwork
457dfdd18a
Updating translations for config/locales/en_CA.yml
2020-09-04 03:13:22 +10:00
Andy Brett
55f9fef2c3
denote that weight is in grams on the bulk order management page
2020-09-03 09:11:00 -07:00
Transifex-Openfoodnetwork
8f896a806a
Updating translations for config/locales/es.yml
2020-09-03 23:36:07 +10:00
Transifex-Openfoodnetwork
71b1c5a3b3
Updating translations for config/locales/ca.yml
2020-09-03 23:35:02 +10:00
Luis Ramos
8256a20aea
Update all locales with the latest Transifex translations
2020-09-03 13:27:16 +01:00
Luis Ramos
07e17d7931
Merge pull request #5979 from mkllnk/fix-locale-for-transifex
...
Add required plural form to locale
2020-09-03 13:21:13 +01:00
Transifex-Openfoodnetwork
d3f48bf684
Updating translations for config/locales/nb.yml
2020-09-03 22:16:04 +10:00
Transifex-Openfoodnetwork
63a6ceede3
Updating translations for config/locales/en_NZ.yml
2020-09-03 19:57:50 +10:00
Luis Ramos
f28241cc5e
Merge duplicate Spree::User#superadmin? into existing Spree::admin?
2020-09-02 22:41:42 +01:00
Luis Ramos
ebf4175662
MErge user class extensions into the User class
2020-09-02 22:41:39 +01:00
Luis Ramos
caf61e3a7e
Run rubocop -a
2020-09-02 22:40:28 +01:00
Luis Ramos
dfa00a770a
Bring user and ability related files from spree_core
2020-09-02 22:37:27 +01:00
Transifex-Openfoodnetwork
5bc0eca493
Updating translations for config/locales/en_FR.yml
2020-09-02 23:08:34 +10:00
Transifex-Openfoodnetwork
f6eb05a6f1
Updating translations for config/locales/fr.yml
2020-09-02 23:07:46 +10:00
Maikel Linke
cd940bd140
Rewrite error message for failed credit card sending
2020-09-02 15:22:23 +10:00
Maikel Linke
09f0035bbd
Add required plural form to locale
...
Transifex complained:
> Key 'spree.activerecord.models.spree/payment' has the wrong number of plurals
While our application may not need that translation, Transifex won't
accept the source file and our updates were broken.
2020-09-02 15:06:15 +10:00
Transifex-Openfoodnetwork
a65bd8edac
Updating translations for config/locales/en_US.yml
2020-09-02 01:28:57 +10:00
Luis Ramos
52fb3c92f0
Merge pull request #5954 from romale/patch-10
...
Missing translation key en.credit_owed and en.new_adjustment
2020-09-01 16:21:22 +01:00
Luis Ramos
66587ccc00
Allow user to remove terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
a3e9226878
Add option to remove existing terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac
Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations
2020-08-31 17:40:34 +01:00
Luis Ramos
5a10a2861e
Reduce the size of the terms and conditions message on the checkout page
2020-08-31 17:40:34 +01:00