Manuel Wiedenmann
6569579c02
styles the preferences in user profile
2013-06-14 22:38:07 +02:00
Julius
b5acd9b116
Merge master branch of base
2013-06-14 18:59:17 +02:00
Julius
885b11dba8
Add english translations for novel delivery functionality
2013-06-14 12:33:16 +02:00
Manuel Wiedenmann
ba923a8f16
updates locale files
2013-06-14 02:53:17 +02:00
Manuel Wiedenmann
5b7ec86ed6
Merge branch master into i18n
2013-06-14 02:02:57 +02:00
Julius
65f61e09d5
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
2013-06-13 23:36:22 +02:00
wvengen
ca9841dd02
fixup translation string order for localeapp roundtrip
2013-06-13 00:09:04 +02:00
wvengen
e3e1b5a1b3
add start of Dutch translation
2013-06-13 00:08:15 +02:00
wvengen
d63e1f8066
translation updates previously missed
2013-06-12 23:20:02 +02:00
wvengen
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
Robert Waltemath
4037ef12da
Users may delete all tasks of a group, i.e. delete the whole group.
2013-06-12 12:02:13 +02:00
Robert Waltemath
46b07a6136
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
...
Conflicts:
config/locales/de.yml
2013-06-12 10:00:11 +02:00
Julius
49cfa9aded
Cleanup StockArticle creation during delivery
2013-06-11 15:05:19 +02:00
Julius
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
wvengen
ad29a238f2
finish English translation
2013-06-10 10:02:33 +02:00
Manuel Wiedenmann
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
wvengen
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
wvengen
3d05900067
make translation roundtrip over localeapp work without changes
2013-06-06 02:28:58 +02:00
wvengen
fb6196b78b
fix translation errors and inconsistencies between German and English
2013-06-06 01:54:50 +02:00
wvengen
75c4e7d6f7
move English translations to single file
2013-06-06 01:33:41 +02:00
wvengen
bf94a4b472
remove superfluous newlines in German translation
2013-06-06 01:33:04 +02:00
wvengen
c4b5a658c0
move German translations to single file
2013-06-06 01:15:56 +02:00
wvengen
d0c74b394e
i18n and translate page number text too
2013-05-20 17:14:42 +02:00
wvengen
0c94ef5912
also translate mail subjects
2013-05-07 13:28:14 +02:00
wvengen
305ae9b5c0
translate missing defaults
2013-05-07 00:15:00 +02:00
wvengen
8b559269c9
add deliveries, pages, tasks translation in English
2013-05-06 12:43:57 +02:00
wvengen
53d5eabf79
fix login i18n
2013-04-26 21:35:23 +02:00
Manuel Wiedenmann
98b729eb71
i18n SimpleForm uses AR as attribute name fallback
2013-04-21 18:22:56 +07:00
wvengen
f95652c756
fix multiline i18n fields
2013-04-19 11:16:21 +02:00
Lippe
cb39a4e587
Corrects typo in en.workgroups.yml
2013-04-16 02:08:47 -04:00
Lippe
f9a87d65a7
Changes copy, grammar, typos in en.simple_form.yml
2013-04-16 02:05:58 -04:00
Lippe
ea83baa676
Changes copy, grammar, typos in en.shared.yml
2013-04-16 02:03:01 -04:00
Lippe
e7a3390371
Changes copy, grammar, typos in en.login.yml
2013-04-16 01:59:36 -04:00
Lippe
c958fe4aac
Changes copy, grammar, typos in en.invites.yml
2013-04-16 01:53:36 -04:00
Lippe
c0437c5145
Changes copy, grammar, typos in en.home.yml
2013-04-16 01:50:12 -04:00
Lippe
fd8d73b768
Changes copy, grammar, typos in en.group_orders.yml
2013-04-16 01:46:17 -04:00
Lippe
ffd6da2d61
Changes copy, grammar, typos in en.foodcoop.yml
2013-04-16 01:44:04 -04:00
Lippe
df6371c4b6
Changes copy, grammar, typos in en.finance.yml
2013-04-16 01:42:45 -04:00
Lippe
c41a849be3
Changes copy, grammar, typos in en.feedback.yml
2013-04-16 01:38:35 -04:00
Lippe
29bb2413aa
Changes copy, grammar, typos in en.defaults.yml
2013-04-16 01:36:23 -04:00
Lippe
022c26f580
Changes copy, grammar, typos in en.articles.yml
2013-04-16 01:36:01 -04:00
Lippe
5362eab4ad
Changes copy, grammar, typos in en.admin.yml
2013-04-16 01:34:57 -04:00
wvengen
5e2a3fb3f0
fix articles controller i18n
...
Conflicts:
app/controllers/articles_controller.rb
2013-04-12 16:17:12 +02:00
wvengen
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
wvengen
70542c1ad7
update en translation
2013-04-12 01:30:02 +02:00
wvengen
ccb116f504
add documents en translation
2013-04-12 01:15:11 +02:00
wvengen
368d44e26b
fix tasks error reference
2013-04-12 01:08:35 +02:00
wvengen
692c70d324
finish pages i18n
2013-04-12 00:59:45 +02:00
wvengen
1a8c8537a4
finish tasks i18n
2013-04-12 00:00:02 +02:00
wvengen
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
wvengen
a501fac76f
helpers i18n
2013-04-10 17:29:06 +02:00
wvengen
3f82138d84
finish deliveries i18n
2013-04-10 17:02:16 +02:00
wvengen
ee5f7ff1b8
small i18n/translation fixes
2013-04-10 14:07:59 +02:00
wvengen
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
wvengen
4aa40b387a
finish article_categories controllers i18n + translation
2013-04-04 02:10:52 +02:00
wvengen
8c8778459e
finish documents i18n
2013-04-04 02:04:31 +02:00
wvengen
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +02:00
wvengen
ec1ef0289b
finish i18n of article_categories + translation
2013-04-04 00:44:07 +02:00
wvengen
e1f5969719
use short form plus title for unit quantity
2013-04-04 00:24:14 +02:00
wvengen
f55a0955d3
add articles, workgroups translation plus other translation updates
2013-04-04 00:13:16 +02:00
wvengen
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
wvengen
75a1051668
finish articles i18n, controller+model
2013-03-22 00:59:42 +01:00
wvengen
aabeb1a332
finish articles i18n
2013-03-22 00:20:37 +01:00
wvengen
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Robert Waltemath
981944b869
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
...
Conflicts:
Gemfile
db/schema.rb
2013-03-15 17:59:19 +01:00
wvengen
cb537bc11c
start articles i18n
2013-03-09 00:40:07 +01:00
wvengen
b81f414ae5
finish finance/order_articles i18n + en translation
2013-03-08 23:35:50 +01:00
wvengen
c9b2d01fa5
i18n last merge
2013-03-06 01:24:57 +01:00
wvengen
2b03a15a9a
finish finance invoice i18n and en translation
2013-02-27 12:31:01 +01:00
wvengen
d3d4bf1e2b
add en translation of finance
2013-02-27 12:11:48 +01:00
wvengen
d9949681a2
localize invite model
2013-02-27 11:59:03 +01:00
Benjamin Meichsner
3fb5c313ee
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
Conflicts:
app/models/ordergroup.rb
2013-02-25 10:49:55 +01:00
wvengen
0b66fe6d62
add en translation foodcop, navigation
2013-02-25 10:36:15 +01:00
wvengen
ae727576dd
en translation update
2013-02-25 10:35:14 +01:00
Benjamin Meichsner
82178161fa
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
2013-02-24 23:26:16 +01:00
wvengen
c8c269e66a
update en translation after small additions
2013-02-22 00:51:58 +01:00
wvengen
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +01:00
wvengen
922a6f3a2a
finish navigation i18n
2013-02-22 00:37:17 +01:00
wvengen
8043fd2164
finish foodcoop i18n + controller + model
2013-02-22 00:19:22 +01:00
wvengen
c69a559dc4
add en translation stock_takings
2013-02-13 23:17:28 +01:00
wvengen
c693f697ff
workgroups i18n
2013-02-13 01:34:58 +01:00
wvengen
02f04be6e8
finish stock_takings i18n + controller
2013-02-13 01:20:20 +01:00
wvengen
1cb933240b
improve translations
2013-02-13 00:53:36 +01:00
wvengen
b59244783e
initial en translation of simple_form, stockit
2013-02-13 00:39:21 +01:00
wvengen
d88a9757ca
improve translations
2013-02-12 00:25:54 +01:00
wvengen
734179a2bd
clarify group_orders i18n
2013-02-12 00:06:23 +01:00
wvengen
dea0d9e215
initial en translation of layouts, mailer, ordergroups, shared
2013-02-11 23:44:36 +01:00
wvengen
20533a5163
fix orders i18n
2013-02-11 15:34:31 +01:00
wvengen
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
Manuel Wiedenmann
0065c44b74
i18n finance ordergroups
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
d2cd5b2b02
i18n group order articles
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
wvengen
8722a5ed36
small en translation updates
2013-02-11 02:29:22 +01:00
wvengen
471405ae21
improve translations
2013-02-11 02:29:22 +01:00
wvengen
df58bf0f18
add translations to en
2013-02-11 02:29:22 +01:00
Manuel Wiedenmann
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
wvengen
36b18bcfbd
finish messages i18n + controller + model
2013-02-09 10:18:52 +01:00
Manuel Wiedenmann
5941bbbf4f
i18n feedback + controller
2013-02-09 13:01:44 +07:00
Manuel Wiedenmann
6a564f0a25
admin controllers
2013-02-09 12:47:21 +07:00
wvengen
8d899581bd
finish group_orders i18n + controller
2013-02-09 02:01:31 +01:00
wvengen
28c66642f5
finish shared i18n
2013-02-08 19:16:06 +01:00
wvengen
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
wvengen
d818ea5d53
finish suppliers controller I18n
2013-02-08 00:31:09 +01:00
wvengen
eb1e02015e
finish suppliers i18n
2013-02-08 00:11:58 +01:00
wvengen
27b488a926
fix whitespace characters in translation
2013-02-07 02:35:46 +01:00
wvengen
e3cf3f4839
improve translations
2013-02-07 00:58:42 +01:00
wvengen
98ef93c74f
add admin, invites and session translations to en
2013-02-07 00:47:26 +01:00
wvengen
de730808e7
finish mailer i18n
2013-02-06 00:50:59 +01:00
wvengen
b12a906a74
finish login i18n + controller
2013-02-05 12:54:55 +01:00
wvengen
419f5ef0ad
fix layouts i18n
2013-02-05 12:43:21 +01:00
wvengen
39812bef99
finish layouts i18n, use help url from config, use html language from locale
2013-02-05 12:11:29 +01:00
wvengen
ecce8041a1
invites controller i18n
2013-02-04 13:01:06 +01:00
wvengen
034f6a8f5c
finish invites i18n
2013-02-04 12:59:04 +01:00
wvengen
9138f0da03
also internationalize home controller
2013-02-04 02:12:24 +01:00
wvengen
1860e1c4cc
also internationalize sessions controller
2013-02-04 02:00:27 +01:00
wvengen
0c09696b2c
finish sessions i18n
2013-02-04 01:46:07 +01:00
wvengen
2b11549d33
finished home i18n
2013-02-04 00:46:22 +01:00
Manuel Wiedenmann
3c70f5e702
de.admin.yml cleanup
2013-02-04 01:42:01 +07:00
Manuel Wiedenmann
64b3d7e17d
finished admin/users i18n + dry the admin i18n
2013-02-04 01:38:18 +07:00
Manuel Wiedenmann
75c9338fd9
finished admin/workgroups i18n
2013-02-04 00:36:03 +07:00
Manuel Wiedenmann
e949257912
finished admin/ordergroups i18n
2013-02-04 00:10:11 +07:00
Manuel Wiedenmann
42c97520a1
started with admin views
2013-02-03 23:16:42 +07:00
wvengen
e0b781fca6
split locales into directory, and load from there
2013-02-01 17:56:34 +01:00
wvengen
afda844380
initial English locale translation
2013-01-31 11:03:32 +01:00
benni
bae09624b7
Avoid deleting categories which still have articles.
2012-12-11 10:53:01 +01:00
benni
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
Robert Waltemath
1cdb9e8501
Outlined new concept for multiple periodically recurring tasks ( #3 ).
2012-11-28 10:13:54 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
699fb9b233
Fixed wiki pages.
2012-10-09 02:31:10 +02:00
benni
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
benni
52e62f8ddb
Fixed messages. New styling for token input plugin.
2012-10-08 18:19:15 +02:00
benni
ab81ef09d5
Replace will_paginate with kaminari. Fixed foodcoop/users page.
2012-10-08 15:24:32 +02:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
cd91436f7f
Allow ignoring apple restriction for specific ordergroup.
2012-09-30 13:34:16 +02:00
benni
ff4ab44bcc
Add option to restrict ordering when not enough apples.
2012-09-29 17:52:25 +02:00
benni
6f7682d6a0
Fixed new user invite.
2012-08-06 12:00:40 +02:00
benni
fc8418bc8e
Some fixes in group forms.
2012-07-31 18:48:41 +02:00
benni
f759552022
Fixed user settings.
2012-07-31 18:21:42 +02:00
benni
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
benni
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
benni
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
benni
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
benni
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
benni
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
benni
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
benni
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
benni
a787b3cf24
Admin/users refactored.
2011-06-09 22:03:27 +02:00
benni
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
benni
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
benni
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
benni
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +02:00
benni
0decbb36e1
Refactored article_categories.
2011-05-18 16:10:30 +02:00
benni
0b1682af7c
Fixed suppliers module.
2011-05-18 15:52:06 +02:00
benni
772cf87c92
Fixed wiki module.
2011-05-18 15:29:38 +02:00
benni
d5552059ce
Refactored messages modul, but refactoring is still neccessary.
2011-05-18 14:47:17 +02:00
benni
1cf63fc40b
Some fixes to home view.
2011-05-16 10:34:14 +02:00
benni
06f2cc2007
Fixed and refactored foodcoop/workgroups.
2011-05-16 00:34:43 +02:00
benni
2e56bfe895
Some fixes for tasks.
2011-05-14 19:02:52 +02:00
benni
03d84aed1d
Added simple form for easier form building.
2011-05-14 17:06:32 +02:00
benni
0757be8319
Updated rails i18n translations.
2011-05-14 16:34:10 +02:00
benni
e589ad5274
Updated rails i18n translations.
2011-05-13 22:44:18 +02:00
benni
4eba5fbc9c
First step for upgrading to rails 3.
...
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
Benjamin Meichsner
ca1c5d7db4
Start with I18n implementation.
2010-05-15 11:11:09 +02:00
Benjamin Meichsner
709425855e
Added validation for unit_quantity and localization for article attributes.
2009-07-21 15:09:55 +02:00
Benjamin Meichsner
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
Benjamin Meichsner
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
Benjamin Meichsner
aa47a24fda
Refactoring of invitations.
2009-02-02 00:09:50 +01:00
Benjamin Meichsner
7f09bb55e4
Fixed some wrong links in admin-startpage and bugs in ordergroup-model.
2009-02-01 21:53:08 +01:00
Benjamin Meichsner
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
Benjamin Meichsner
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
