nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4836 commits 4 branches 0 tags 121 MiB
Commit graph

377 commits

Author SHA1 Message Date
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-22 16:40:01 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
zhitomirskiyi
e84ce5591f The discription in several places 2010-11-22 14:55:30 -08:00
zhitomirskiyi
edbb0bdf07 slightly more discriptive cannot remove the person from the last aspect messagge 2010-11-22 14:52:39 -08:00
Sarah Mei
ab37fd0d98 Fix type-o on front page, copy edit a bit. 2010-11-22 14:11:27 -08:00
MrZYX
e72f4e1da7 translatable status is good again 
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
 2010-11-22 22:30:37 +01:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
maxwell
9f5ba1a1ea added finished state to sidbar for getting started 2010-11-21 16:13:02 -08:00
danielvincent
6e603bf2af aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts. 2010-11-21 16:13:02 -08:00
danielvincent
f6491816a3 adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing. 2010-11-21 16:13:00 -08:00
Hexagon
93b0f3fd81 Updating rails-i18n 2010-11-21 01:52:59 +01:00
MrZYX
b97abbd251 hebrew is at 100%, thanks yaron 2010-11-20 14:40:57 +01:00
MrZYX
b0f4a871ee dutch is at 100%, thanks Kevin Kleinman 2010-11-20 13:29:55 +01:00
MrZYX
50120878fb updated locales from 99translations 
removed fr-informal
german is at 100%
swedish is at 100%, thanks Hexagon
french is at 100%, thanks ed0h
russian is at almost 90%, thanks rapmon
 2010-11-20 01:16:01 +01:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Jonne Hass
f426c08dcc made shared/_contatct_list.html.haml 
and the type after "viewing:" in shared/_author_info.html.haml translatable
 2010-11-19 17:25:05 +01:00
MrZYX
7200c007e5 made file uploader translatable 2010-11-19 15:25:14 +01:00
Raphael
6841ffbecc Disable_with on comment form 2010-11-18 15:41:51 -08:00
Raphael
c7b8c185bd Disable with on publisher form 2010-11-18 15:41:51 -08:00
MrZYX
dcbcaefcbe added language codes map 2010-11-18 15:13:30 -08:00
MrZYX
60375422e7 pulled update for sk.yml from the rails i18n project 2010-11-18 15:13:30 -08:00
MrZYX
3f76699805 pulled update for et.yml from rails i18n 2010-11-18 15:13:30 -08:00
MrZYX
13ca682734 added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales 2010-11-18 15:13:30 -08:00
Raphael
61692c1da6 Fix translation missing in inv mailer 2010-11-18 12:50:46 -08:00
Raphael
187e9ac198 Merge remote branch 'jandom/475-Chore-Add-missing-polish-locales' 2010-11-18 11:59:55 -08:00
danielvincent
558c175c2b resolved translation issue in diaspora.en in user dropdown. second login link on landing page works. 2010-11-17 21:57:27 -08:00
Jan
b088e0d685 Added missing polish locales, using all of the previous translations. 2010-11-17 20:50:38 +01:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
Alec Leamas
90b86690d9 Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4 2010-11-16 16:25:32 +01:00
maxwell
f6c6030c6d fixing a translation 2010-11-15 23:08:57 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Hexagon
13a2b8ce07 Small fix to devise.sv 2010-11-15 22:28:36 +01:00
Hexagon
1d3d2565df Forgot to change en.yml, here it is 2010-11-15 22:28:36 +01:00
Hexagon
35095f8859 Update of sv.yml to reflect latest changes + small fix to en.yml 2010-11-15 22:28:36 +01:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
danielvincent
969c668518 translation fix on _person.haml. button tweak 2010-11-13 12:10:09 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
livefromthemoon@gmail.com
82f9aefaa8 Updated some french translation strings 2010-11-12 12:26:34 -08:00
livefromthemoon@gmail.com
cdfc406aad Added missing french translations 2010-11-12 12:26:34 -08:00
Jonne Hass
1816b1e4df people.show.add_friend -> people.person.add_friend 2010-11-12 06:07:37 +01:00
MrZYX
5ae4248b30 some more fixes I overlooked. Sorry 2010-11-12 06:07:37 +01:00
MrZYX
f55a973685 two small fixes 2010-11-12 06:07:37 +01:00
Hexagon
52da9c84ed Update of sv.yml to match latest additions 2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0 just found the mailer... :) 2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
Hexagon
a4f5a1e7ae Updated swedish translation 2010-11-12 06:07:36 +01:00
MrZYX
748efb1860 eliminated senseless duplicates in en.yml 2010-11-12 06:07:36 +01:00
Jonne Hass
a957ba3aed so then I remove the newly unused friends_since for you 2010-11-12 06:06:16 +01:00
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7 fixes to be in sync with latest commits 2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
381c53b775 found some untranslatable strings 2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6 refactored en.yml 
removed unused keys out of en.yml
replaced some ' with "
 2010-11-12 06:04:05 +01:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
 2010-11-04 20:05:57 -07:00
Raphael
c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-04 18:56:43 -07:00
MrZYX
1102fcd565 made flash messages translatable 2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
MrZYX
80b8e5e42d updated german locale (informal) to reflect latest changes 2010-11-02 12:12:47 -07:00
MrZYX
7cd6e3a868 updated german locale (informal) with keys from pull request 465 
again with help of michiwend
 2010-11-02 12:12:47 -07:00
MrZYX
b1c9961a72 updated german locale so no keys are missing (informal) 
also added parts for german from the rails i18n project
still some parts missing, unclear or not translatable look at #FIXME's
even added translation that is missing in en.yml :P
thanks to michiwend for help
 2010-11-02 12:12:47 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
Alec Leamas
fceffba261 Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor 2010-11-02 16:34:47 +01:00
Raphael
7244730961 Merge remote branch 'ed0h/fr-update' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 17:36:05 -07:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
Raphael
41d839ecf4 Merge remote branch 'ecleel/master' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:39:38 -07:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
Hexagon
65419e423a Added missing strings to swedish translation 2010-11-01 16:42:47 +01:00
J David Eisenberg
1a32766fb0 Issue #492: Informal, vague description when signing up as a new user 2010-11-01 16:42:47 +01:00
Curtis J Schofield
f693a97bf3 i put in a dash 2010-11-01 16:42:46 +01:00
livefromthemoon@gmail.com
60f6e091d3 Added missing strings to french translation 2010-11-01 00:27:32 +01:00
J David Eisenberg
f54820f456 Issue #496: Eliminate self-links in Getting Started 2010-10-31 12:16:07 -07:00
Abdulaziz Al-Shetwi
96906d9eaf Retranslate arabic localization. 2010-10-31 14:14:48 +03:00
Hexagon
0bef839261 Translating a huge amount of untranslated strings 2010-10-30 15:24:26 +02:00
Alec Leamas
58ead768d6 Small fix 2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98 Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2 2010-10-30 09:54:28 +02:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
Hexagon
99661a3240 Added swedish translations 2010-10-30 01:32:32 +02:00
danielvincent
8ec49e685b going to a non-friend's page contains a way to add them. 2010-10-29 15:43:44 -07:00
Alec Leamas
94327264d4 Comments on Swedish diaspora terms, trailing blanks killed 2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f modified: config/locales/diaspora/sv.yml 2010-10-29 00:55:27 +02:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
Raphael
16e455958c Merge remote branch 'hexagon/se-localization' 2010-10-27 11:08:06 -07:00
Raphael
f700eb537a Add activemodel error message for person to en and fr locales 2010-10-27 10:27:30 -07:00
danielvincent
a8086f2990 further refinements. added back buttons, more explanation text. 2010-10-26 23:27:26 -07:00
Raphael
f975199f19 Merge remote branch 'mael/fr-locales' 2010-10-26 16:40:50 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
Hexagon
1382bd9d08 Fixed header in swedish translation 2010-10-25 21:45:43 +02:00
Hexagon
d617392108 Added/complemented swedish translation 2010-10-25 21:41:32 +02:00
maelsoucaze
14ac908c3d French localizations updates. 2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9 Merge remote branch 'upstream/master' into fr-locales 2010-10-25 00:04:24 +02:00
maxwell
bc9c852e25 fixed translation showing en on person show page when the person had no posts 2010-10-20 17:52:07 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
maelsoucaze
34b21e7543 French localization updates. 2010-10-16 17:19:19 +02:00
danielvincent
db31357172 another typo change 2010-10-15 11:16:04 -07:00
danielvincent
d18b59f3d3 typo fix 2010-10-15 11:12:12 -07:00
Raphael
0680c2b5a6 Merge remote branch 'maelsoucaze/fr-locales' 2010-10-14 17:43:27 -07:00
Raphael
ecc7a55f8b Merge remote branch 'flea/master' 
Conflicts:
	.gitignore
 2010-10-14 17:24:46 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -07:00
maelsoucaze
9134c4545c Fixes and updates French (Informal Honorifics) localization. 2010-10-15 01:17:33 +02:00
maelsoucaze
753deedc65 Fixes and updates French (Formal Honorifics) localization. 2010-10-15 01:17:17 +02:00
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
Volkan Unsal
241d104bc1 change en to tr 2010-10-13 21:10:36 -04:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -07:00
ilya
bb7e2a9918 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
Volkan Unsal
73f06bb61b add devise.tr.yml 2010-10-11 15:09:43 -04:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
Volkan Unsal
6d00b2ca8a correct some spelling errors in Turkish translation 2010-10-10 23:49:36 -04:00
Volkan Unsal
35ad703a5b Merge branch 'master' of http://github.com/diaspora/diaspora 2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed finished Turkish translation 2010-10-10 23:06:56 -04:00
Nick van der Burgt
09b38bb726 Added dutch locale 2010-10-08 09:11:04 +02:00
ilya
4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites 
Conflicts:
	Gemfile
	Gemfile.lock
 2010-10-07 18:20:51 -07:00
Raphael
2bb36a266a Merge remote branch 'minilibra/master' 2010-10-07 17:32:20 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
bd9e9043e0 fixed nb locale 2010-10-07 14:37:38 -07:00
minilibra
ae6f39a0d0 Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer. 2010-10-08 02:09:13 +07:00
Raphael
e47aa90b15 Merge remote branch 'Stigjb/master' 2010-10-07 11:06:27 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Raphael
0831812e97 Merge remote branch 'kashif/master' 2010-10-07 10:41:50 -07:00
Yaron Shahrabani
77d5b68e15 Fixed some typos 2010-10-06 08:29:58 +08:00
Daniele Di Sarli
5074d2f8f2 Updated Italian translation 2010-10-06 08:25:29 +08:00
UserAd
1d0a4579f6 Add missing localization for aspect managment 2010-10-06 07:56:23 +08:00
UserAd
e7c153df4e Add translation support in profile ('or' between buttons). Fix Russian locale 2010-10-06 07:56:23 +08:00
Stig Johan Berggren
ff7c8c7a50 Added locale files for Norwegian (bokmål) 
Localization files for Norwegian bokmål (nm) inserted. They have been
tested a little locally and do not produce any errors.
 2010-09-29 17:58:25 +02:00
Kashif Rasul
330cf63599 Arabic locale fixes. 2010-09-29 17:13:27 +02:00
Kashif Rasul
08ddae0894 Added devise Arabic locales and moved locale to correct folder. 2010-09-29 16:54:33 +02:00
Kashif Rasul
0fed72d505 Added Arabic locales. 2010-09-28 13:57:40 +02:00
ilya
a8f05244ba localization should be fixed 2010-09-27 16:07:24 -07:00
ilya
50234b095b had to move translation around slightly, now the profile edit will be missing a template 2010-09-27 16:02:08 -07:00
Guillermo
1a876355d5 Some fixes in spanish locale 2010-09-28 03:02:47 +08:00
Daniele Di Sarli
6b9bcfda63 Corrected Italian translation 2010-09-28 02:41:59 +08:00
Raphael
2f31e036e3 Merge branch 'cz' of http://github.com/koo5/diaspora 2010-09-27 11:36:04 -07:00
Raphael
ef2647c188 Merge branch 'master' of http://github.com/yarons/diaspora 2010-09-27 10:52:32 -07:00