Andy Brett
a93eef38c0
Merge pull request #7923 from vishaldeepak/tooltip-order-cycle-subscription
...
Tooltip added for 'New Schedule' and 'New Order Cycle'
2021-07-19 19:32:09 -07:00
Maikel Linke
fd8766ec77
Update translations
2021-07-16 10:41:08 +10:00
Maikel
3e66f475e5
Merge pull request #7925 from openfoodfoundation/transifex
...
Transifex
2021-07-16 10:32:46 +10:00
Transifex-Openfoodnetwork
a46145f44f
Updating translations for config/locales/ru.yml
2021-07-15 18:45:17 +10:00
Transifex-Openfoodnetwork
20d4cb1366
Updating translations for config/locales/es.yml
2021-07-15 03:46:05 +10:00
Transifex-Openfoodnetwork
f269fb9104
Updating translations for config/locales/ca.yml
2021-07-15 03:45:09 +10:00
Matt-Yorkley
60595059e2
Drop unused options from Pagy initializer
2021-07-14 13:17:33 +01:00
Matt-Yorkley
b3c4a38b0f
Enable 'pagy/extras/items' for customising items parameter
2021-07-14 13:17:33 +01:00
Nihal Mohammed
e5bdaa603a
Setup pagy
2021-07-14 13:17:33 +01:00
vishaldeepak
b70ba7085a
Tooltip added for 'New Schedule' and 'New Order Cycle' in Order Cycles tab of admin
2021-07-14 15:15:12 +05:30
Transifex-Openfoodnetwork
61598fc971
Updating translations for config/locales/en_CA.yml
2021-07-14 05:40:31 +10:00
Transifex-Openfoodnetwork
e4a7fe7cb2
Updating translations for config/locales/de_DE.yml
2021-07-14 05:12:41 +10:00
Transifex-Openfoodnetwork
8ba0ac0b8f
Updating translations for config/locales/en_FR.yml
2021-07-14 01:53:29 +10:00
Transifex-Openfoodnetwork
511bb73278
Updating translations for config/locales/fr.yml
2021-07-14 01:53:21 +10:00
Matt-Yorkley
0d16be3f94
Merge pull request #7779 from Matt-Yorkley/stripe-stock-check
...
Stripe stock check
2021-07-13 14:46:34 +02:00
Andy Brett
b475476a22
Update all locales with the latest Transifex translations
2021-07-12 15:45:59 -07:00
Transifex-Openfoodnetwork
afbd2b520e
Updating translations for config/locales/en_GB.yml
2021-07-12 18:13:42 +10:00
Andy Brett
718f9c4af8
Merge pull request #7848 from jibees/7842-locale-management-on-user_passwords-controller
...
Handle lang management on user passwords controller
2021-07-09 08:55:09 -07:00
Transifex-Openfoodnetwork
99f127148e
Updating translations for config/locales/ru.yml
2021-07-09 23:26:43 +10:00
Transifex-Openfoodnetwork
cce6ba65dd
Updating translations for config/locales/fr.yml
2021-07-09 23:25:43 +10:00
Transifex-Openfoodnetwork
bb6162059d
Updating translations for config/locales/en_FR.yml
2021-07-09 23:25:34 +10:00
Transifex-Openfoodnetwork
cf66d96746
Updating translations for config/locales/en_FR.yml
2021-07-09 22:27:37 +10:00
Transifex-Openfoodnetwork
c82db9716c
Updating translations for config/locales/fr.yml
2021-07-09 22:26:57 +10:00
Matt-Yorkley
9bcf0d5b38
Handle Stripe payments when checkout fails due to stock issues
...
This can occur when stock is reduced after the user is redirected to Stripe and before they are redirected back. The stock is insufficient, the order is not complete, the user is bounced back to the cart, but a *pending* Stripe payment is left on the order.
2021-07-09 13:13:20 +01:00
Matt-Yorkley
d4052a0e62
Merge pull request #7893 from guidoDutra/1861-add-shopfront-sort-placeholder-translations
...
Add translations to shopfront sorting placeholders
2021-07-09 12:37:40 +02:00
Transifex-Openfoodnetwork
74ba812061
Updating translations for config/locales/ru.yml
2021-07-09 16:23:32 +10:00
Guido Oliveira
9bc41cf04f
Add translations to shopfront sorting placeholders
2021-07-07 14:39:10 -03:00
Transifex-Openfoodnetwork
277a2a4d58
Updating translations for config/locales/de_DE.yml
2021-07-07 22:50:38 +10:00
Andy Brett
46cd05c54a
Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer
...
Enable sorting by producer in shopfront
2021-07-06 09:27:42 -07:00
Jean-Baptiste Bellet
aa982fe8df
Create a new method to change the lang of the app
...
- The old method (link to `?locale=#{l.to_s}`) was not functional for path that already has query params in current path (such as `/user/spree_user/password/edit?reset_password_token=`) ;
- This seems that the best way to handle this, is to create a new route, new method that effectively set the lang (not the locale actually...) and then redirect_back (ie. using the HTTP_REFERER, with a fallback to `/`)
s
2021-07-06 10:09:37 +02:00
Matt-Yorkley
b1324c6269
Merge pull request #7745 from Matt-Yorkley/dotenv
...
Dotenv
2021-07-02 15:03:15 +02:00
Matt-Yorkley
97a087707d
Merge pull request #7873 from openfoodfoundation/transifex
...
Transifex
2021-07-01 18:57:56 +02:00
Transifex-Openfoodnetwork
f065df669a
Updating translations for config/locales/de_DE.yml
2021-07-02 02:28:44 +10:00
Transifex-Openfoodnetwork
a2196b08a3
Updating translations for config/locales/en_IE.yml
2021-07-02 02:28:42 +10:00
Transifex-Openfoodnetwork
aa7d08dff7
Updating translations for config/locales/en_FR.yml
2021-07-02 02:25:41 +10:00
Transifex-Openfoodnetwork
fab3486669
Updating translations for config/locales/en_GB.yml
2021-07-02 02:25:38 +10:00
Transifex-Openfoodnetwork
71e97b3eba
Updating translations for config/locales/es.yml
2021-07-02 02:25:35 +10:00
Matt-Yorkley
0005a77115
Update all locales with the latest Transifex translations
2021-07-01 16:01:24 +01:00
Pau Pérez Fabregat
f6e0b9af0e
Merge pull request #7646 from apricot12/advanced_settings_button_OC_edits
...
Add advanced settings button to incoming and outgoing pages in OC cyc…
2021-07-01 15:37:16 +02:00
Matt-Yorkley
12f7e2d685
Set nicer Redis defaults for dev environment
...
In Staging and Production we have two Redis instances running on two different ports. In dev that probably won't be set up, and Redis will be on port 6379 by default. These defaults mean it will work nicely out of the box.
2021-07-01 12:59:11 +01:00
Matt-Yorkley
083f512aae
Refactor Sidekiq settings and set expiry in development
...
This means old cache entries will be automatically removed instead of perpetually filling up the local Redis instance in dev.
2021-07-01 12:59:11 +01:00
Nihal Mohammed
f7795ca21a
Fix failing specs
2021-06-30 09:50:38 -07:00
Nihal Mohammed
cd0b97bf0a
Update i18n configs
2021-06-30 09:50:38 -07:00
Andy Brett
63fcb40f6c
update config to address deprecation warning for missing translations config
2021-06-29 10:22:25 -07:00
Transifex-Openfoodnetwork
71609a6489
Updating translations for config/locales/en_IE.yml
2021-06-25 22:28:54 +10:00
Transifex-Openfoodnetwork
f707284c6c
Updating translations for config/locales/ru.yml
2021-06-24 23:38:03 +10:00
Transifex-Openfoodnetwork
2eb67cf61b
Updating translations for config/locales/de_DE.yml
2021-06-22 07:46:31 +10:00
Transifex-Openfoodnetwork
27c6a842bd
Updating translations for config/locales/es.yml
2021-06-21 18:41:34 +10:00
Transifex-Openfoodnetwork
3cb6f77cbb
Updating translations for config/locales/ca.yml
2021-06-21 18:41:21 +10:00
Transifex-Openfoodnetwork
030ad350b6
Updating translations for config/locales/en_GB.yml
2021-06-21 18:17:46 +10:00
