Commit Graph

214 Commits

Author SHA1 Message Date
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 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
2013-03-06 01:01:12 +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
Julius 467b53c009 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete 2013-02-25 11:14:48 +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
Julius 5dc3fc30ad Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
Julius 8f15cfb446 Revert 396a47b6af 2013-02-25 10:13:44 +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