From maddingue at free.fr Sun Jun 2 06:09:32 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 06:09:32 +0200 (CEST) Subject: svn commit: [2299] trunk/lib/Act/Handler/WebAPI.pm: added ability to return registered user list (Barbie) Message-ID: <20130602040932.EF0C784422@spectre.mongueurs.net> Revision: 2299 Author: maddingue Date: 2013-06-02 06:09:32 +0200 (Sun, 02 Jun 2013) Log Message: ----------- added ability to return registered user list (Barbie) Modified Paths: -------------- trunk/lib/Act/Handler/WebAPI.pm Modified: trunk/lib/Act/Handler/WebAPI.pm =================================================================== --- trunk/lib/Act/Handler/WebAPI.pm 2013-05-19 16:55:55 UTC (rev 2298) +++ trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 04:09:32 UTC (rev 2299) @@ -17,6 +17,7 @@ country town web_page pm_group pause_id monk_id monk_name im email language timezone company address vat + registered )), }, default => [ qw(public_name email) ], @@ -69,12 +70,14 @@ sub _get_attendees { my ($m, $fields) = @_; + my %fields = map { $_ => 1 } @$fields; + my @fields = grep { !/registered/ } @$fields; my $users = Act::User->get_items( conf_id => $Request{conference} ); my @data; for my $user (@$users) { - push @data, _get_fields($m, $fields, $user) - if $user->committed; + push @data, _get_fields($m, \@fields, $user) + if($user->committed || ($user->has_registered && $fields{registered})); } return \@data; } From maddingue at free.fr Sun Jun 2 06:18:47 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 06:18:47 +0200 (CEST) Subject: svn commit: [2300] trunk/lib/Act/Handler/WebAPI.pm: reindent; add lines Message-ID: <20130602041847.06BCE84424@spectre.mongueurs.net> Revision: 2300 Author: maddingue Date: 2013-06-02 06:18:46 +0200 (Sun, 02 Jun 2013) Log Message: ----------- reindent; add lines Modified Paths: -------------- trunk/lib/Act/Handler/WebAPI.pm Modified: trunk/lib/Act/Handler/WebAPI.pm =================================================================== --- trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 04:09:32 UTC (rev 2299) +++ trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 04:18:46 UTC (rev 2300) @@ -9,39 +9,41 @@ use Act::User; my %Methods = ( - get_attendees => { run => \&_get_attendees, - fields => { - map( { $_ => 0 } - qw(user_id login - salutation first_name last_name full_name public_name pseudonymous - country town web_page pm_group pause_id monk_id monk_name im email - language timezone - company address vat - registered - )), - }, - default => [ qw(public_name email) ], - }, - get_talks => { run => \&_get_talks, - fields => { - map( { $_ => 0 } - qw(talk_id user_id track_id - title abstract url_abstract url_talk duration lightning - accepted confirmed - level lang - )), - datetime => \&_talk_datetime, - room => \&_talk_room, - speaker => \&_talk_speaker, - track => \&_talk_track, - }, - default => [ qw(title speaker room datetime) ], - }, + get_attendees => { + run => \&_get_attendees, + fields => { + map( { $_ => 0 } + qw(user_id login + salutation first_name last_name full_name public_name pseudonymous + country town web_page pm_group pause_id monk_id monk_name im email + language timezone + company address vat + registered + )), + }, + default => [ qw(public_name email) ], + }, + get_talks => { + run => \&_get_talks, + fields => { + map( { $_ => 0 } + qw(talk_id user_id track_id + title abstract url_abstract url_talk duration lightning + accepted confirmed + level lang + )), + datetime => \&_talk_datetime, + room => \&_talk_room, + speaker => \&_talk_speaker, + track => \&_talk_track, + }, + default => [ qw(title speaker room datetime) ], + }, ); my $json = JSON::XS->new->utf8->pretty(1); -sub handler -{ + +sub handler { # authenticate if ( $Request{args}{api_key} && $Config->api_keys->{ $Request{args}{api_key} } ) { @@ -67,8 +69,9 @@ } $Request{status} = BAD_REQUEST; } -sub _get_attendees -{ + + +sub _get_attendees { my ($m, $fields) = @_; my %fields = map { $_ => 1 } @$fields; my @fields = grep { !/registered/ } @$fields; @@ -81,8 +84,9 @@ } return \@data; } -sub _get_talks -{ + + +sub _get_talks { my ($m, $fields) = @_; my $talks = Act::Talk->get_talks( conf_id => $Request{conference} ); @@ -93,8 +97,9 @@ } return \@data; } -sub _get_fields -{ + + +sub _get_fields { my ($m, $fields, $object) = @_; my %data; @@ -107,24 +112,28 @@ } return \%data; } -sub _talk_datetime -{ + + +sub _talk_datetime { my $talk = shift; return $Config->talks_show_schedule && $talk->datetime ? $talk->datetime->epoch : undef; } -sub _talk_room -{ + + +sub _talk_room { my $talk = shift; return $Config->talks_show_schedule && $talk->room ? $talk->room : undef; } -sub _talk_speaker -{ + + +sub _talk_speaker { my $talk = shift; my $user = Act::User->new(user_id => $talk->user_id); return $user->public_name; } -sub _talk_track -{ + + +sub _talk_track { my $talk = shift; if ($talk->track_id) { my $track = Act::Track->new(track_id => $talk->track_id); From maddingue at free.fr Sun Jun 2 06:39:01 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 06:39:01 +0200 (CEST) Subject: svn commit: [2301] trunk/lib/Act/Config.pm: fix "Use of qw(...) as parentheses is deprecated" warning Message-ID: <20130602043901.9716584429@spectre.mongueurs.net> Revision: 2301 Author: maddingue Date: 2013-06-02 06:39:01 +0200 (Sun, 02 Jun 2013) Log Message: ----------- fix "Use of qw(...) as parentheses is deprecated" warning Modified Paths: -------------- trunk/lib/Act/Config.pm Modified: trunk/lib/Act/Config.pm =================================================================== --- trunk/lib/Act/Config.pm 2013-06-02 04:18:46 UTC (rev 2300) +++ trunk/lib/Act/Config.pm 2013-06-02 04:39:01 UTC (rev 2301) @@ -398,7 +398,7 @@ sub _load_config { my ($cfg, $dir) = @_; - for my $file qw(act local) { + for my $file (qw< act local >) { my $path = catfile($dir, 'conf', "$file.ini"); if (-e $path) { open my $fh, '<:encoding(UTF-8)', $path From maddingue at free.fr Sun Jun 2 06:44:55 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 06:44:55 +0200 (CEST) Subject: svn commit: [2302] trunk/lib/Act/Handler/WebAPI.pm: add a get_events method Message-ID: <20130602044455.D772C84437@spectre.mongueurs.net> Revision: 2302 Author: maddingue Date: 2013-06-02 06:44:55 +0200 (Sun, 02 Jun 2013) Log Message: ----------- add a get_events method Modified Paths: -------------- trunk/lib/Act/Handler/WebAPI.pm Modified: trunk/lib/Act/Handler/WebAPI.pm =================================================================== --- trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 04:39:01 UTC (rev 2301) +++ trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 04:44:55 UTC (rev 2302) @@ -4,6 +4,7 @@ use JSON::XS (); use Act::Config; +use Act::Event; use Act::Talk; use Act::Track; use Act::User; @@ -23,6 +24,17 @@ }, default => [ qw(public_name email) ], }, + + get_events => { + run => \&_get_events, + fields => { + map({ $_ => 0 } qw< event_id title abstract url_abstract duration >), + datetime => \&_talk_datetime, + room => \&_talk_room, + }, + default => [ qw(title speaker room datetime) ], + }, + get_talks => { run => \&_get_talks, fields => { @@ -86,6 +98,16 @@ } +sub _get_events { + my ($m, $fields) = @_; + + my $events = Act::Event->get_events( conf_id => $Request{conference} ); + my @data = map { _get_fields($m, $fields, $_) } @$events; + + return \@data +} + + sub _get_talks { my ($m, $fields) = @_; From maddingue at free.fr Sun Jun 2 07:52:12 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 07:52:12 +0200 (CEST) Subject: svn commit: [2303] trunk/lib/Act/Handler/WebAPI.pm: forgot to update default fields for get_events Message-ID: <20130602055212.EBEBD84448@spectre.mongueurs.net> Revision: 2303 Author: maddingue Date: 2013-06-02 07:52:12 +0200 (Sun, 02 Jun 2013) Log Message: ----------- forgot to update default fields for get_events Modified Paths: -------------- trunk/lib/Act/Handler/WebAPI.pm Modified: trunk/lib/Act/Handler/WebAPI.pm =================================================================== --- trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 04:44:55 UTC (rev 2302) +++ trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 05:52:12 UTC (rev 2303) @@ -32,7 +32,7 @@ datetime => \&_talk_datetime, room => \&_talk_room, }, - default => [ qw(title speaker room datetime) ], + default => [qw< title room datetime >], }, get_talks => { From maddingue at free.fr Sun Jun 2 08:39:08 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 08:39:08 +0200 (CEST) Subject: svn commit: [2304] trunk/lib/Act/Handler/WebAPI.pm: add a field to fetch the attendees of a talk Message-ID: <20130602063908.82EF984422@spectre.mongueurs.net> Revision: 2304 Author: maddingue Date: 2013-06-02 08:39:08 +0200 (Sun, 02 Jun 2013) Log Message: ----------- add a field to fetch the attendees of a talk Modified Paths: -------------- trunk/lib/Act/Handler/WebAPI.pm Modified: trunk/lib/Act/Handler/WebAPI.pm =================================================================== --- trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 05:52:12 UTC (rev 2303) +++ trunk/lib/Act/Handler/WebAPI.pm 2013-06-02 06:39:08 UTC (rev 2304) @@ -48,6 +48,7 @@ room => \&_talk_room, speaker => \&_talk_speaker, track => \&_talk_track, + attendees=> \&_talk_attendees, }, default => [ qw(title speaker room datetime) ], }, @@ -136,6 +137,13 @@ } +sub _talk_attendees { + my $talk = shift; + my $attendees = Act::User->attendees($talk->talk_id); + return join ",", map $_->user_id, @$attendees +} + + sub _talk_datetime { my $talk = shift; return $Config->talks_show_schedule && $talk->datetime ? $talk->datetime->epoch : undef; From maddingue at free.fr Sun Jun 2 08:49:23 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 08:49:23 +0200 (CEST) Subject: svn commit: [2305] trunk/po/nb.po: Fixed a missing " and rewrote some odd sentences (olekvi) Message-ID: <20130602064923.908C18444D@spectre.mongueurs.net> Revision: 2305 Author: maddingue Date: 2013-06-02 08:49:23 +0200 (Sun, 02 Jun 2013) Log Message: ----------- Fixed a missing " and rewrote some odd sentences (olekvi) Modified Paths: -------------- trunk/po/nb.po Modified: trunk/po/nb.po =================================================================== --- trunk/po/nb.po 2013-06-02 06:39:08 UTC (rev 2304) +++ trunk/po/nb.po 2013-06-02 06:49:23 UTC (rev 2305) @@ -128,10 +128,10 @@ msgstr "Du har forel?pig ikke kj?pt din billett til konferansen." msgid "Please consider doing so using our online payment system." -msgstr "Tenk om ikke du skal gj?re dette ved ? bruke v?rt online-betalingssystem." +msgstr "Vurder ??bruke v?rt online-betalingssystem." msgid "Please consider doing so once our online payment system is ready." -msgstr "Tenk om ikke du skal gj?re dette n?r v?rt online-betalingssystem er klart for bruk." +msgstr "Vurder ??bruke v?rt online-betalingssystem n?r det er klart for bruk." msgid "You have not confirmed your participation to this conference yet." msgstr "Du har ikke enn? bekreftet din deltagelse p? denne konferansen." @@ -148,7 +148,7 @@ msgstr "kj?pe din billett til konferansen" msgid "confirm your participation" -msgstr "bekrefte din deltagelse +msgstr "bekrefte din deltagelse" msgid "register for this conference" msgstr "registrere deg for denne konferansen" @@ -1322,7 +1322,7 @@ msgid "An email has been sent to you. Click on the link in the email to" msgstr "" -"En epost er blitt sendt til deg. Klikk p? linken i denne eposten for\n" +"En epost er sendt til deg. Klikk p? linken i denne eposten for\n" "? f? tilgang til din deltagerkonto, hvor du kan sette et nytt passord.\n" msgid "Tags" From maddingue at free.fr Sun Jun 2 08:50:37 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 08:50:37 +0200 (CEST) Subject: svn commit: [2306] trunk/po/fr.po: improve French translation (afranke) Message-ID: <20130602065037.5BA618444A@spectre.mongueurs.net> Revision: 2306 Author: maddingue Date: 2013-06-02 08:50:37 +0200 (Sun, 02 Jun 2013) Log Message: ----------- improve French translation (afranke) Modified Paths: -------------- trunk/po/fr.po Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2013-06-02 06:49:23 UTC (rev 2305) +++ trunk/po/fr.po 2013-06-02 06:50:37 UTC (rev 2306) @@ -106,7 +106,7 @@ msgstr "aux conf?rences g?r?es par Act." msgid "You have purchased your conference ticket:" -msgstr "Vous avez achet? votre billet pour la conf?rence :" +msgstr "Vous avez achet? votre billet pour la conf?rence :" msgid "Order number" msgstr "Num?ro d'inscription " @@ -206,7 +206,7 @@ msgstr "Email de confirmation envoy?" msgid "In order to complete your operation" -msgstr "Pour terminer l'op?ration sur \"%1\", veuillez cliquer sur le lien suivant :" +msgstr "Pour terminer l'op?ration sur \"%1\", veuillez cliquer sur le lien suivant :" msgid " confirmation" msgstr "%1 - confirmation" @@ -297,12 +297,12 @@ msgstr "Inscription" msgid "Registered!" -msgstr "Inscrit !" +msgstr "Inscrit !" msgid "Congratulations, you are now registered" msgstr "" "Bravo, %1, vous ?tes maintenant inscrit. Votre\n" -"mot de passe est %2 .\n" +"mot de passe est %2.\n" msgid "First Name" msgstr "Pr?nom" @@ -314,7 +314,7 @@ msgstr "T-Shirt" msgid "Join!" -msgstr "Inscription !" +msgstr "Inscription !" msgid "edit" msgstr "modifier" @@ -332,7 +332,7 @@ msgstr "Valider" msgid "Forgot your password?" -msgstr "Mot de passe oubli? ? Cliquez ici." +msgstr "Mot de passe oubli? ? Cliquez ici." msgid "This site uses cookies to authenticate logged in users." msgstr "" @@ -343,7 +343,7 @@ msgstr "Identifiant ou mot de passe incorrect" msgid "Logged as:" -msgstr "Connect? comme :" +msgstr "Connect? comme :" msgid "Logout" msgstr "D?connexion" @@ -529,7 +529,7 @@ msgstr "Le nombre de personnes vous accompagnant doit ?tre un nombre" msgid "Not a valid GPG key ID: 8 hexadecimal digits expected" -msgstr "Cl? GPG invalide : 8 chiffres hexad?cimaux attendus" +msgstr "Cl? GPG invalide : 8 chiffres hexad?cimaux attendus" msgid "Salutation" msgstr "Civilit?" @@ -632,7 +632,7 @@ "ainsi, quand quelqu'un essayera de savoir avec qui il a eu\n" "cette charmante discussion durant la conf?rence, cette personne pourra vous\n" "reconna?tre facilement.
\n" -"Souvenez-vous en t?l?chargeant votre photo !\n" +"Souvenez-vous en t?l?chargeant votre photo !\n" msgid "Delete Photo" msgstr "Effacer photo" @@ -643,7 +643,7 @@ msgid "Someone, possibly you, has requested that your password be reset." msgstr "" "Quelqu'un, peut-?tre vous, a demand? ? changer votre mot de passe.\n" -"Pour terminer l'op?ration, veuillez cliquer sur le lien suivant :\n" +"Pour terminer l'op?ration, veuillez cliquer sur le lien suivant?:\n" msgid "If you have received this message without having requested it, it is" msgstr "" @@ -806,13 +806,13 @@ msgstr "L'?v?nement %1 a ?t? supprim?." msgid "Date:" -msgstr "Date :" +msgstr "Date :" msgid "Not scheduled yet." msgstr "Pas encore planifi?" msgid "Duration:" -msgstr "Dur?e :" +msgstr "Dur?e :" msgid "You can find more information on the following site:" msgstr "Vous pouvez trouver plus d'information sur le site suivant :" @@ -1017,9 +1017,9 @@ msgstr "" "Votre paiement en ligne ? %1 est enregistr?.\n" "\n" -"Num?ro de commande : %2\n" -"Date de r?glement : %3 GMT\n" -"Montant r?gl? : %4 %5\n" +"Num?ro de commande : %2\n" +"Date de r?glement : %3 GMT\n" +"Montant r?gl? : %4 %5\n" msgid "Invoice #" msgstr "Facture N?" @@ -1220,10 +1220,10 @@ msgstr "Vous pouvez trouver plus d'information sur le site du pr?sentateur :" msgid "Abstract:" -msgstr "R?sum? :" +msgstr "R?sum? :" msgid "Talk:" -msgstr "Pr?sentation :" +msgstr "Pr?sentation :" msgid "Talk removed" msgstr "Pr?sentation supprim?e" @@ -1238,13 +1238,13 @@ msgstr "Pr?sentation modifi?e" msgid "Submitted by:" -msgstr "Soumis par :" +msgstr "Soumis par :" msgid "The following fields have been updated:" -msgstr "Les champs suivant on ?t? modifi?s :" +msgstr "Les champs suivant on ?t? modifi?s :" msgid "By:" -msgstr "Par :" +msgstr "Par :" msgid "Remember me on this computer" msgstr "Se souvenir du mot de passe" @@ -1341,10 +1341,10 @@ msgstr "Tags" msgid "Tags:" -msgstr "Tags :" +msgstr "Tags :" msgid "add new tags:" -msgstr "ajouter des tags :" +msgstr "ajouter des tags :" msgid "To unregister from ," msgstr "" @@ -1388,7 +1388,7 @@ msgstr "Emploi du temps personnel" msgid "Attending talks" -msgstr "Assite ?" +msgstr "Assiste ?" msgid "Promotion code" msgstr "Code promotionnel" From maddingue at free.fr Sun Jun 2 08:54:34 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 08:54:34 +0200 (CEST) Subject: svn commit: [2307] branches/stable/po: merge revisions 2305, 2306: update French and Norwegian translations Message-ID: <20130602065434.706678444A@spectre.mongueurs.net> Revision: 2307 Author: maddingue Date: 2013-06-02 08:54:34 +0200 (Sun, 02 Jun 2013) Log Message: ----------- merge revisions 2305, 2306: update French and Norwegian translations - Fixed a missing " and rewrote some odd sentences (olekvi) - improve French translation (afranke) Modified Paths: -------------- branches/stable/po/fr.po branches/stable/po/nb.po Modified: branches/stable/po/fr.po =================================================================== --- branches/stable/po/fr.po 2013-06-02 06:50:37 UTC (rev 2306) +++ branches/stable/po/fr.po 2013-06-02 06:54:34 UTC (rev 2307) @@ -106,7 +106,7 @@ msgstr "aux conf?rences g?r?es par Act." msgid "You have purchased your conference ticket:" -msgstr "Vous avez achet? votre billet pour la conf?rence :" +msgstr "Vous avez achet? votre billet pour la conf?rence :" msgid "Order number" msgstr "Num?ro d'inscription " @@ -206,7 +206,7 @@ msgstr "Email de confirmation envoy?" msgid "In order to complete your operation" -msgstr "Pour terminer l'op?ration sur \"%1\", veuillez cliquer sur le lien suivant :" +msgstr "Pour terminer l'op?ration sur \"%1\", veuillez cliquer sur le lien suivant :" msgid " confirmation" msgstr "%1 - confirmation" @@ -297,12 +297,12 @@ msgstr "Inscription" msgid "Registered!" -msgstr "Inscrit !" +msgstr "Inscrit !" msgid "Congratulations, you are now registered" msgstr "" "Bravo, %1, vous ?tes maintenant inscrit. Votre\n" -"mot de passe est %2 .\n" +"mot de passe est %2.\n" msgid "First Name" msgstr "Pr?nom" @@ -314,7 +314,7 @@ msgstr "T-Shirt" msgid "Join!" -msgstr "Inscription !" +msgstr "Inscription !" msgid "edit" msgstr "modifier" @@ -332,7 +332,7 @@ msgstr "Valider" msgid "Forgot your password?" -msgstr "Mot de passe oubli? ? Cliquez ici." +msgstr "Mot de passe oubli? ? Cliquez ici." msgid "This site uses cookies to authenticate logged in users." msgstr "" @@ -343,7 +343,7 @@ msgstr "Identifiant ou mot de passe incorrect" msgid "Logged as:" -msgstr "Connect? comme :" +msgstr "Connect? comme :" msgid "Logout" msgstr "D?connexion" @@ -529,7 +529,7 @@ msgstr "Le nombre de personnes vous accompagnant doit ?tre un nombre" msgid "Not a valid GPG key ID: 8 hexadecimal digits expected" -msgstr "Cl? GPG invalide : 8 chiffres hexad?cimaux attendus" +msgstr "Cl? GPG invalide : 8 chiffres hexad?cimaux attendus" msgid "Salutation" msgstr "Civilit?" @@ -632,7 +632,7 @@ "ainsi, quand quelqu'un essayera de savoir avec qui il a eu\n" "cette charmante discussion durant la conf?rence, cette personne pourra vous\n" "reconna?tre facilement.
\n" -"Souvenez-vous en t?l?chargeant votre photo !\n" +"Souvenez-vous en t?l?chargeant votre photo !\n" msgid "Delete Photo" msgstr "Effacer photo" @@ -643,7 +643,7 @@ msgid "Someone, possibly you, has requested that your password be reset." msgstr "" "Quelqu'un, peut-?tre vous, a demand? ? changer votre mot de passe.\n" -"Pour terminer l'op?ration, veuillez cliquer sur le lien suivant :\n" +"Pour terminer l'op?ration, veuillez cliquer sur le lien suivant?:\n" msgid "If you have received this message without having requested it, it is" msgstr "" @@ -806,13 +806,13 @@ msgstr "L'?v?nement %1 a ?t? supprim?." msgid "Date:" -msgstr "Date :" +msgstr "Date :" msgid "Not scheduled yet." msgstr "Pas encore planifi?" msgid "Duration:" -msgstr "Dur?e :" +msgstr "Dur?e :" msgid "You can find more information on the following site:" msgstr "Vous pouvez trouver plus d'information sur le site suivant :" @@ -1017,9 +1017,9 @@ msgstr "" "Votre paiement en ligne ? %1 est enregistr?.\n" "\n" -"Num?ro de commande : %2\n" -"Date de r?glement : %3 GMT\n" -"Montant r?gl? : %4 %5\n" +"Num?ro de commande : %2\n" +"Date de r?glement : %3 GMT\n" +"Montant r?gl? : %4 %5\n" msgid "Invoice #" msgstr "Facture N?" @@ -1220,10 +1220,10 @@ msgstr "Vous pouvez trouver plus d'information sur le site du pr?sentateur :" msgid "Abstract:" -msgstr "R?sum? :" +msgstr "R?sum? :" msgid "Talk:" -msgstr "Pr?sentation :" +msgstr "Pr?sentation :" msgid "Talk removed" msgstr "Pr?sentation supprim?e" @@ -1238,13 +1238,13 @@ msgstr "Pr?sentation modifi?e" msgid "Submitted by:" -msgstr "Soumis par :" +msgstr "Soumis par :" msgid "The following fields have been updated:" -msgstr "Les champs suivant on ?t? modifi?s :" +msgstr "Les champs suivant on ?t? modifi?s :" msgid "By:" -msgstr "Par :" +msgstr "Par :" msgid "Remember me on this computer" msgstr "Se souvenir du mot de passe" @@ -1341,10 +1341,10 @@ msgstr "Tags" msgid "Tags:" -msgstr "Tags :" +msgstr "Tags :" msgid "add new tags:" -msgstr "ajouter des tags :" +msgstr "ajouter des tags :" msgid "To unregister from ," msgstr "" @@ -1388,7 +1388,7 @@ msgstr "Emploi du temps personnel" msgid "Attending talks" -msgstr "Assite ?" +msgstr "Assiste ?" msgid "Promotion code" msgstr "Code promotionnel" Modified: branches/stable/po/nb.po =================================================================== --- branches/stable/po/nb.po 2013-06-02 06:50:37 UTC (rev 2306) +++ branches/stable/po/nb.po 2013-06-02 06:54:34 UTC (rev 2307) @@ -128,10 +128,10 @@ msgstr "Du har forel?pig ikke kj?pt din billett til konferansen." msgid "Please consider doing so using our online payment system." -msgstr "Tenk om ikke du skal gj?re dette ved ? bruke v?rt online-betalingssystem." +msgstr "Vurder ??bruke v?rt online-betalingssystem." msgid "Please consider doing so once our online payment system is ready." -msgstr "Tenk om ikke du skal gj?re dette n?r v?rt online-betalingssystem er klart for bruk." +msgstr "Vurder ??bruke v?rt online-betalingssystem n?r det er klart for bruk." msgid "You have not confirmed your participation to this conference yet." msgstr "Du har ikke enn? bekreftet din deltagelse p? denne konferansen." @@ -148,7 +148,7 @@ msgstr "kj?pe din billett til konferansen" msgid "confirm your participation" -msgstr "bekrefte din deltagelse +msgstr "bekrefte din deltagelse" msgid "register for this conference" msgstr "registrere deg for denne konferansen" @@ -1322,7 +1322,7 @@ msgid "An email has been sent to you. Click on the link in the email to" msgstr "" -"En epost er blitt sendt til deg. Klikk p? linken i denne eposten for\n" +"En epost er sendt til deg. Klikk p? linken i denne eposten for\n" "? f? tilgang til din deltagerkonto, hvor du kan sette et nytt passord.\n" msgid "Tags" From maddingue at free.fr Sun Jun 2 08:58:28 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 08:58:28 +0200 (CEST) Subject: svn commit: [2308] trunk/templates/core/user: Link the PAUSE id to MetaCPAN (dolmen) Message-ID: <20130602065828.4B06B84422@spectre.mongueurs.net> Revision: 2308 Author: maddingue Date: 2013-06-02 08:58:28 +0200 (Sun, 02 Jun 2013) Log Message: ----------- Link the PAUSE id to MetaCPAN (dolmen) Modified Paths: -------------- trunk/templates/core/user/change trunk/templates/core/user/show Modified: trunk/templates/core/user/change =================================================================== --- trunk/templates/core/user/change 2013-06-02 06:54:34 UTC (rev 2307) +++ trunk/templates/core/user/change 2013-06-02 06:58:28 UTC (rev 2308) @@ -270,9 +270,9 @@ [%- IF pause_id %] - + [% END %] - Pause id + PAUSE id [%- IF pause_id %] [% END %] Modified: trunk/templates/core/user/show =================================================================== --- trunk/templates/core/user/show 2013-06-02 06:54:34 UTC (rev 2307) +++ trunk/templates/core/user/show 2013-06-02 06:58:28 UTC (rev 2308) @@ -77,11 +77,11 @@ [%- IF user.pause_id %] - Pause id + PAUSE id   - [% user.pause_id %] + [% user.pause_id %] [% END %] [%- IF user.monk_id %] From maddingue at free.fr Sun Jun 2 08:59:18 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 08:59:18 +0200 (CEST) Subject: svn commit: [2309] branches/stable/templates/core/user: Link the PAUSE id to MetaCPAN (dolmen) Message-ID: <20130602065918.829F784422@spectre.mongueurs.net> Revision: 2309 Author: maddingue Date: 2013-06-02 08:59:18 +0200 (Sun, 02 Jun 2013) Log Message: ----------- Link the PAUSE id to MetaCPAN (dolmen) Modified Paths: -------------- branches/stable/templates/core/user/change branches/stable/templates/core/user/show Modified: branches/stable/templates/core/user/change =================================================================== --- branches/stable/templates/core/user/change 2013-06-02 06:58:28 UTC (rev 2308) +++ branches/stable/templates/core/user/change 2013-06-02 06:59:18 UTC (rev 2309) @@ -270,9 +270,9 @@ [%- IF pause_id %] - + [% END %] - Pause id + PAUSE id [%- IF pause_id %] [% END %] Modified: branches/stable/templates/core/user/show =================================================================== --- branches/stable/templates/core/user/show 2013-06-02 06:58:28 UTC (rev 2308) +++ branches/stable/templates/core/user/show 2013-06-02 06:59:18 UTC (rev 2309) @@ -77,11 +77,11 @@ [%- IF user.pause_id %] - Pause id + PAUSE id   - [% user.pause_id %] + [% user.pause_id %] [% END %] [%- IF user.monk_id %] From maddingue at free.fr Sun Jun 2 09:02:26 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 09:02:26 +0200 (CEST) Subject: svn commit: [2310] trunk/templates/user/change_password: Show the old password field only if the user is logged in Message-ID: <20130602070226.5AFD084446@spectre.mongueurs.net> Revision: 2310 Author: maddingue Date: 2013-06-02 09:02:26 +0200 (Sun, 02 Jun 2013) Log Message: ----------- Show the old password field only if the user is logged in Modified Paths: -------------- trunk/templates/user/change_password Modified: trunk/templates/user/change_password =================================================================== --- trunk/templates/user/change_password 2013-06-02 06:59:18 UTC (rev 2309) +++ trunk/templates/user/change_password 2013-06-02 07:02:26 UTC (rev 2310) @@ -15,7 +15,7 @@
- +[% IF (global.request.user) %] @@ -24,6 +24,7 @@ +[% END %] From maddingue at free.fr Sun Jun 2 09:05:56 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 09:05:56 +0200 (CEST) Subject: svn commit: [2312] branches/stable/templates/user: merge revisions 2310, 2311: fix some password templates issues Message-ID: <20130602070556.9B22484447@spectre.mongueurs.net> Revision: 2312 Author: maddingue Date: 2013-06-02 09:05:56 +0200 (Sun, 02 Jun 2013) Log Message: ----------- merge revisions 2310, 2311: fix some password templates issues - Show the old password field only if the user is logged in (dotandimet) - set the password field length to the same as everywhere Modified Paths: -------------- branches/stable/templates/user/change_password branches/stable/templates/user/twostep_change_password Modified: branches/stable/templates/user/change_password =================================================================== --- branches/stable/templates/user/change_password 2013-06-02 07:03:34 UTC (rev 2311) +++ branches/stable/templates/user/change_password 2013-06-02 07:05:56 UTC (rev 2312) @@ -15,7 +15,7 @@
{{Current password}}
{{New password}}
{{Enter your new password twice}} From maddingue at free.fr Sun Jun 2 09:03:34 2013 From: maddingue at free.fr (maddingue at free.fr) Date: Sun, 2 Jun 2013 09:03:34 +0200 (CEST) Subject: svn commit: [2311] trunk/templates/user/twostep_change_password: set the password field length to the same as everywhere Message-ID: <20130602070334.E69338444A@spectre.mongueurs.net> Revision: 2311 Author: maddingue Date: 2013-06-02 09:03:34 +0200 (Sun, 02 Jun 2013) Log Message: ----------- set the password field length to the same as everywhere Modified Paths: -------------- trunk/templates/user/twostep_change_password Modified: trunk/templates/user/twostep_change_password =================================================================== --- trunk/templates/user/twostep_change_password 2013-06-02 07:02:26 UTC (rev 2310) +++ trunk/templates/user/twostep_change_password 2013-06-02 07:03:34 UTC (rev 2311) @@ -22,7 +22,7 @@ 		{{Login}}   - +
- +[% IF (global.request.user) %] @@ -24,6 +24,7 @@ +[% END %]
{{Current password}}
{{New password}}
{{Enter your new password twice}} Modified: branches/stable/templates/user/twostep_change_password =================================================================== --- branches/stable/templates/user/twostep_change_password 2013-06-02 07:03:34 UTC (rev 2311) +++ branches/stable/templates/user/twostep_change_password 2013-06-02 07:05:56 UTC (rev 2312) @@ -22,7 +22,7 @@ 		{{Login}}   - +