Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2305 commits 22 branches 1 tag 31 MiB
Commit graph

2305 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Robert Waltemath
82fb6d1dbe Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-06-06 00:37:50 +02:00
wvengen
043fc6391c show header on fax PDF (closes bennibu#109) 2013-06-04 13:08:50 +02:00
Robert Waltemath
c194d2545f Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107. 2013-06-04 11:28:25 +02:00
Manuel Wiedenmann
c2c1961bd0 adds i18n support to routes and application controller; default_locale is set to :en 2013-05-31 18:42:28 +02:00
Robert Waltemath
2a1176c31a Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-05-30 10:54:22 +02:00
Manuel Wiedenmann
c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann
21c7fa40c1 adds a foodsoft:setup_development rake task 2013-05-26 14:02:16 +02:00
Manuel Wiedenmann
2fb7797c12 readds mysql 2013-05-25 20:31:15 +02:00
Manuel Wiedenmann
ec74b642a0 adds sqlite3 to Gemfile to test deployment 2013-05-25 20:16:49 +02:00
Manuel Wiedenmann
6b84f4f117 updates common_deploy 2013-05-25 20:10:48 +02:00
Manuel Wiedenmann
4024329474 adds doc/DEPLOYMENT instructions 2013-05-25 20:03:53 +02:00
Manuel Wiedenmann
92d9a57f3f adds capistrano for deployment 2013-05-25 19:38:14 +02:00
Manuel Wiedenmann
a3df346110 DEVELOPMENT typo 2013-05-25 15:44:01 +02:00
Manuel Wiedenmann
e49db90dae readme typo 2013-05-25 15:05:09 +02:00
Manuel Wiedenmann
1f44204b58 readme updates 2013-05-25 15:03:31 +02:00
Manuel Wiedenmann
15f1ade167 Merge branch 'rails3' into master 
Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/models/article_price.rb
	app/models/message.rb
	config/environment.rb
	vendor/plugins/acts_as_configurable/Rakefile
	vendor/plugins/acts_as_configurable/tasks/acts_as_configurable_tasks.rake
	vendor/plugins/acts_as_ordered/Rakefile
	vendor/plugins/acts_as_paranoid/Rakefile
	vendor/plugins/acts_as_tree/Rakefile
	vendor/plugins/acts_as_versioned/Rakefile
	vendor/plugins/auto_complete/Rakefile
	vendor/plugins/prawnto/Rakefile
	vendor/plugins/wikicloth/Rakefile
	vendor/plugins/will_paginate/Rakefile
 2013-05-21 20:36:07 +02:00
wvengen
d0c74b394e i18n and translate page number text too 2013-05-20 17:14:42 +02:00
wvengen
3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +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