Maikel Linke
b8c2e54194
Fix i18n key and spec
2017-07-21 12:17:14 +10:00
Maikel Linke
9f243e6d3c
Fix title of /admin/content/edit
...
Spree uses the global i18n key `contents` to print the title. A previous
change made that an object containing other i18n keys which was then
displayed as title.
This change moves the i18n content to the scope of the view where they
are displayed.
2017-07-21 12:17:13 +10:00
Maikel Linke
71742a80b5
Make two more strings translatable
2017-07-21 12:17:13 +10:00
Maikel Linke
f4b1667005
Replace global translations by local ones
2017-07-21 12:17:13 +10:00
Maikel Linke
e5c9845b10
Remove duplicate haml code
2017-07-21 12:17:13 +10:00
Maikel Linke
d3fc89f42a
Unify haml code for colouring
2017-07-21 12:17:13 +10:00
Maikel Linke
9c6454b47a
Remove duplicated code
...
A label was accidentally inserted twice. Also removed some duplicate
translation.
2017-07-21 12:17:13 +10:00
Maikel Linke
7d2484c8bf
Remove superfluous string interpolation
2017-07-21 12:17:13 +10:00
Maikel Linke
9723c8b82b
Move translation into the right place
...
The dashboard couldn't find a translation, because it is in the spree
namespace.
Also simplified the translation using the `count` feature.
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
8b2b51d511
Fix code style for Rubocop
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
872a150c7d
Refactor some translations to use interpolation
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
739d06cf03
Extract translations from javascript
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9fa7a30c7e
Fix failing tests and extract validation message Procs into methods
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ba0b17e168
Extract translations from controllers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
5caaec8ef3
Extract translations from mailers and helpers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9971c9f923
Extract translations from models
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
1920ee7e88
Extract translations from serializers and overrides
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
55b2c19b64
Extract translations from lib folder
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
60060a7017
Start admin/reports extract translations
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
clairezed
5c66a2fc9d
Fix wrong key replacement for producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
5f8890e963
update producers pack translation key from sell_description_text to producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
58c463497a
#1541 fixing wrong translation key in producers packs
2017-07-21 11:15:03 +10:00
Duende13
b2bae242d9
Sorting variants by name_to_display and unit_value. Issue 1604.
2017-07-21 10:18:55 +10:00
François Turbelin
a0595bc45a
Add missing translations on views
2017-07-19 09:45:11 +10:00
Enrico Stano
bde3fa4ce6
Merge pull request #1671 from coopdevs/multiline-method-calls
...
Use indented style for multiline method calls
2017-07-12 18:40:34 +02:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Pau Perez
385847d7da
Doc why FinalizeAccount uses order objects
...
Read the top-level class documentation for the details.
2017-07-12 11:49:04 +10:00
Matt-Yorkley
23a6e2dd8f
Changed modal redirect behaviour
2017-06-28 14:35:17 +10:00
Rob Harrington
e5340cb53a
Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
28ea23965b
Rubocop: Correct Lint/AmbiguousOperator offences
2017-06-23 16:49:08 +10:00
Rob Harrington
fc5b339e2a
Rubocop: Correct Lint/DuplicateMethods offences
2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Continuous Integration
931a5be162
Merge remote-tracking branch 'origin/master' into HEAD
2017-06-22 13:19:25 +10:00
Maikel Linke
e437cba155
Make style flexible for all sizes of logos
...
Trying to support logos that are big. But logos that are too small
should not be stretched either, better small than ugly.
Remove static size declaration from HTML template since it doesn't
reflect the logo size.
Unfortunately, there are other CSS files that are in conflict. The file
mail/email.css.scss defines this globally:
img {
max-width: 100%;
}
2017-06-16 16:49:43 +10:00
Maikel Linke
3330e9b219
Init registration form with default country
2017-06-14 16:47:02 +10:00
Maikel Linke
884743ce97
Filter countries without states for registration
2017-06-14 16:47:01 +10:00
Maikel Linke
78f5002be5
Separate variant names by spaces
...
To enable the search for the beginning of a variant name, they need to
be separated.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:37:46 +10:00
Maikel Linke
a42799dff4
Initialise product.variant_names
...
Not initialising `product.variant_names` causes it to become the string
"undefinedVariant1Variant2" while it should just be "Variant1Variant2".
This mistake did not matter when `variant_names` was just used to search
for a sub-string. A recent change to search only for the beginning of a
word, caused this to fail.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:28:55 +10:00
Matt-Yorkley
ba27d63f9c
Fix logo sizing
2017-06-06 13:59:42 +01:00
Julius Pabrinkis
0083733c4c
#1471 Do no let long producers' name go under icon
2017-06-02 16:29:43 +10:00
Julius Pabrinkis
a1ffc869f3
Refactor code by suggestion to use RegExp and add tests coverage
2017-06-02 15:42:35 +10:00
Rhodri Karim
7a07e8fa16
Issue 1233: product filter should only match if name begins withs search term
2017-06-02 15:42:35 +10:00
Rob Harrington
8b560e6cee
Cleaning up angular variant units controllers a little bit
2017-05-24 15:05:33 +10:00
Matt-Yorkley
7974ac45f2
Add unit description placeholder
2017-05-24 15:05:33 +10:00
Matt-Yorkley
41b5cf10dd
Quick testing update
2017-05-24 15:05:33 +10:00
Matt-Yorkley
6c36c269c8
Product Edit UX adjustments
2017-05-24 15:05:33 +10:00
Pierre de Lacroix
b879ea5a96
add comments
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
a6ed4a2c6a
fix bad return value
...
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
