Raphael
|
2489f8503f
|
Merge branch 'master' into HEAD
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
|
2010-09-22 21:32:03 -07:00 |
|
Ariel Zavala
|
1f78c3400b
|
Started Spanish Locale
|
2010-09-21 01:48:54 +08:00 |
|
Ariel Zavala
|
e9f74675e9
|
Merged with diaspora; fixed conflicts; only 2 red
|
2010-09-19 11:16:00 -04:00 |
|
Ariel Zavala
|
4558f9901e
|
Added translations to photos and registrations controllers
|
2010-09-17 18:25:36 -04:00 |
|
Ariel Zavala
|
c1c20e14f7
|
Added translations to requests controller
|
2010-09-17 17:05:54 -04:00 |
|
Ariel Zavala
|
f95cebcb8b
|
Added translations to new requests view and aspects controller
|
2010-09-17 16:38:50 -04:00 |
|
Ariel Zavala
|
cb145c346a
|
Added I18n translations to helpers
|
2010-09-17 15:30:02 -04:00 |
|
Ariel Zavala
|
0014024870
|
Added I18n translations to helpers
|
2010-09-17 15:26:31 -04:00 |
|
Ariel Zavala
|
271925a7f6
|
added photo view translations
|
2010-09-17 11:34:45 -04:00 |
|
Ariel Zavala
|
c6b34be63d
|
Added people views translations
|
2010-09-17 11:27:08 -04:00 |
|
Ariel Zavala
|
1384b65565
|
added more translations missing on views
|
2010-09-17 10:46:03 -04:00 |
|
Ariel Zavala
|
07138041b0
|
Fixed album controller errors
|
2010-09-16 23:35:57 -04:00 |
|
Ariel Zavala
|
8f56178bd2
|
added diaspora site specific localization files
|
2010-09-16 17:29:25 -04:00 |
|
Ariel Zavala
|
d7ca279fa9
|
Revert "Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml"
This reverts commit b7cfbd6fd7.
|
2010-09-16 17:27:26 -04:00 |
|
Ariel Zavala
|
b7cfbd6fd7
|
Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml
|
2010-09-16 17:05:11 -04:00 |
|
Ariel Zavala
|
060ba12376
|
Started Spanish Locale
|
2010-09-16 16:30:17 -04:00 |
|