Commit graph

8 commits

Author SHA1 Message Date
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
f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen
24d04b25db fix some small i18n errors 2013-04-04 00:56:45 +02:00
wvengen
e1f5969719 use short form plus title for unit quantity 2013-04-04 00:24:14 +02: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
cb537bc11c start articles i18n 2013-03-09 00:40:07 +01:00