@@ -10,6 +10,7 @@ DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}" EXTRA_DEPENDENCIES = [ 'activesupport', 'activerecord', + 'locale', 'gettext', ['picnic', '>= 0.8.1'] ] # An array of rubygem dependencies [name, version] config/hoe.rb @@ -114,21 +114,21 @@ module CASServer::CAS success = false if ticket.nil? - error = "Your login request did not include a login ticket. There may be a problem with the authentication system." - $LOG.warn("Missing login ticket.") + error = _("Your login request did not include a login ticket. There may be a problem with the authentication system.") + $LOG.warn "Missing login ticket." elsif lt = LoginTicket.find_by_ticket(ticket) if lt.consumed? - error = "The login ticket you provided has already been used up. Please try logging in again." - $LOG.warn("Login ticket '#{ticket}' previously used up") + error = _("The login ticket you provided has already been used up. Please try logging in again.") + $LOG.warn "Login ticket '#{ticket}' previously used up" elsif Time.now - lt.created_on < $CONF.maximum_unused_login_ticket_lifetime - $LOG.info("Login ticket '#{ticket}' successfully validated") + $LOG.info "Login ticket '#{ticket}' successfully validated" else - error = "You took too long to log in (your login ticket has expired). Please try logging in again." - $LOG.warn("Expired login ticket '#{ticket}'") + error = _("You took too long to enter your credentials. Please try again.") + $LOG.warn "Expired login ticket '#{ticket}'" end else - error = "The login ticket you provided is invalid. Please try logging in again." - $LOG.warn("Invalid login ticket '#{ticket}'") + error = _("The login ticket you provided is invalid. There may be a problem with the authentication system.") + $LOG.warn "Invalid login ticket '#{ticket}'" end lt.consume! if lt @@ -141,13 +141,13 @@ module CASServer::CAS if ticket.nil? error = "No ticket granting ticket given." - $LOG.debug(error) + $LOG.debug error elsif tgt = TicketGrantingTicket.find_by_ticket(ticket) if $CONF.expire_sessions && Time.now - tgt.created_on > $CONF.ticket_granting_ticket_expiry error = "Your session has expired. Please log in again." - $LOG.info("Ticket granting ticket '#{ticket}' for user '#{tgt.username}' expired.") + $LOG.info "Ticket granting ticket '#{ticket}' for user '#{tgt.username}' expired." else - $LOG.info("Ticket granting ticket '#{ticket}' for user '#{tgt.username}' successfully validated.") + $LOG.info "Ticket granting ticket '#{ticket}' for user '#{tgt.username}' successfully validated." end else error = "Invalid ticket granting ticket '#{ticket}' (no matching ticket found in the database)." @@ -158,25 +158,25 @@ module CASServer::CAS end def validate_service_ticket(service, ticket, allow_proxy_tickets = false) - $LOG.debug("Validating service/proxy ticket '#{ticket}' for service '#{service}'") + $LOG.debug "Validating service/proxy ticket '#{ticket}' for service '#{service}'" if service.nil? or ticket.nil? error = Error.new(:INVALID_REQUEST, "Ticket or service parameter was missing in the request.") - $LOG.warn("#{error.code} - #{error.message}") + $LOG.warn "#{error.code} - #{error.message}" elsif st = ServiceTicket.find_by_ticket(ticket) if st.consumed? error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' has already been used up.") - $LOG.warn("#{error.code} - #{error.message}") + $LOG.warn "#{error.code} - #{error.message}" elsif st.kind_of?(CASServer::Models::ProxyTicket) && !allow_proxy_tickets error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' is a proxy ticket, but only service tickets are allowed here.") - $LOG.warn("#{error.code} - #{error.message}") + $LOG.warn "#{error.code} - #{error.message}" elsif Time.now - st.created_on > $CONF.maximum_unused_service_ticket_lifetime error = Error.new(:INVALID_TICKET, "Ticket '#{ticket}' has expired.") - $LOG.warn("Ticket '#{ticket}' has expired.") + $LOG.warn "Ticket '#{ticket}' has expired." elsif !st.matches_service? service error = Error.new(:INVALID_SERVICE, "The ticket '#{ticket}' belonging to user '#{st.username}' is valid,"+ " but the requested service '#{service}' does not match the service '#{st.service}' associated with this ticket.") - $LOG.warn("#{error.code} - #{error.message}") + $LOG.warn "#{error.code} - #{error.message}" else $LOG.info("Ticket '#{ticket}' for service '#{service}' for user '#{st.username}' successfully validated.") end lib/casserver/cas.rb @@ -12,14 +12,32 @@ module CASServer end def determine_locale - lang = ($CONF[:default_locale] || "en") - lang = @input['lang'] unless @input['lang'].blank? - lang ||= @cookies['lang'] unless @cookies['lang'].blank? - lang ||= @env.HTTP_ACCEPT_LANGUAGE unless @env.HTTP_ACCEPT_LANGUAGE.blank? - lang ||= @env.HTTP_USER_AGENT =~ /[^a-z]([a-z]{2}(-[a-z]{2})?)[^a-z]/i && - lang = $~[1] unless @env.HTTP_USER_AGENT.blank? - @cookies['lang'] = lang - + + source = nil + lang = case + when !input['lang'].blank? + source = "'lang' request variable" + cookies['lang'] = input['lang'] + input['lang'] + when !cookies['lang'].blank? + source = "'lang' cookie" + cookies['lang'] + when !@env['HTTP_ACCEPT_LANGUAGE'].blank? + source = "'HTTP_ACCEPT_LANGUAGE' header" + lang = @env['HTTP_ACCEPT_LANGUAGE'] + when !@env['HTTP_USER_AGENT'].blank? && @env['HTTP_USER_AGENT'] =~ /[^a-z]([a-z]{2}(-[a-z]{2})?)[^a-z]/i + source = "'HTTP_USER_AGENT' header" + $~[1] + when !$CONF['default_locale'].blank? + source = "'default_locale' config option" + $CONF[:default_locale] + else + source = "default" + "en" + end + + $LOG.debug "Detected locale is #{lang.inspect} (from #{source})" + lang.gsub!('_','-') # TODO: Need to confirm that this method of splitting the accepted @@ -52,6 +70,8 @@ module CASServer end chosen_lang = "en" if chosen_lang.blank? + + $LOG.debug "Chosen locale is #{chosen_lang.inspect}" return chosen_lang end lib/casserver/localization.rb @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: RubyCAS-Server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"Project-Id-Version: rubycas-server \n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-11-12 12:49-0500\n" "Last-Translator: Matt Zukowski <mzukowski@urbacon.net>\n" "Language-Team: German\n" @@ -16,76 +16,104 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." msgstr "" -"Sie sind derzeit angemeldet als '%s'. Sollten dies nicht Sie sein, melden Sie sich bitte unten an." +"Sie sind derzeit angemeldet als '%s'. Sollten dies nicht Sie sein, melden " +"Sie sich bitte unten an." #: lib/casserver/controllers.rb:37 msgid "" "The client and server are unable to negotiate authentication. Please try " "logging in again later." msgstr "" -"Client und Server sind nicht in der Lage eine Authentifizierung auszuhandeln. Bitte versuchen " -"Sie, sich zu einem späteren Zeitpunkt erneut anzumelden." +"Client und Server sind nicht in der Lage eine Authentifizierung " +"auszuhandeln. Bitte versuchen Sie, sich zu einem späteren Zeitpunkt erneut " +"anzumelden." #: lib/casserver/controllers.rb:54 msgid "" "The server cannot fulfill this gateway request because no service parameter " "was given." msgstr "" -"Der Server kann diese Gateway-Anfrage nicht erfüllen, da keine Service-Parameter übergeben " -"wurden." +"Der Server kann diese Gateway-Anfrage nicht erfüllen, da keine Service-" +"Parameter übergeben wurden." #: lib/casserver/controllers.rb:59 lib/casserver/controllers.rb:195 msgid "" "The target service your browser supplied appears to be invalid. Please " "contact your system administrator for help." msgstr "" -"Das Ziel-Service, welches Ihr Browsers geliefert hat, scheint ungültig zu sein. Bitte " -"wenden Sie sich an Ihren Systemadministrator, um Hilfe zu erhalten." +"Das Ziel-Service, welches Ihr Browsers geliefert hat, scheint ungültig zu " +"sein. Bitte wenden Sie sich an Ihren Systemadministrator, um Hilfe zu " +"erhalten." #: lib/casserver/controllers.rb:88 msgid "" "Could not guess the CAS login URI. Please supply a submitToURI parameter " "with your request." msgstr "" -"Der CAS-Login-URI konnte nicht erraten werden. Bitte ergänzen Sie Ihre Anfrage " -" um einen submitToURI Parameter." +"Der CAS-Login-URI konnte nicht erraten werden. Bitte ergänzen Sie Ihre " +"Anfrage um einen submitToURI Parameter." #: lib/casserver/controllers.rb:184 msgid "You have successfully logged in." -msgstr "Sie haben sich erfolgreich am Central Authentication Service angemeldet." +msgstr "" +"Sie haben sich erfolgreich am Central Authentication Service angemeldet." #: lib/casserver/controllers.rb:200 msgid "Incorrect username or password." msgstr "Falscher Benutzername oder Passwort." -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." -msgstr "Sie haben sich erfolgreich vom Central Authentication Service abgemeldet." +msgstr "" +"Sie haben sich erfolgreich vom Central Authentication Service abgemeldet." -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " Bitte klicken Sie auf den folgenden Link, um fortzufahren:" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." -msgstr "Für die Generierung eines Login-Tickets, ist eine POST-Anfrage erforderlich." +msgstr "" +"Für die Generierung eines Login-Tickets, ist eine POST-Anfrage erforderlich." -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " Zentrales Login" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "Benutzername" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "Passwort" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "ANMELDEN" po/de_DE/rubycas-server.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: RubyCAS-Server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"Project-Id-Version: rubycas-server \n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-11-12 12:30-0500\n" "Last-Translator: Matt Zukowski <mzukowski@urbacon.net>\n" "Language-Team: Spanish\n" @@ -16,25 +16,49 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." msgstr "" -"Usted está conectado como '%s'. Si no lo es usted, por favor, acceda a continuación." +"Usted está conectado como '%s'. Si no lo es usted, por favor, acceda a " +"continuación." #: lib/casserver/controllers.rb:37 msgid "" "The client and server are unable to negotiate authentication. Please try " "logging in again later." msgstr "" -"El cliente y el servidor no están en condiciones de negociar la autenticación. Por favor, " -"intente acceder de nuevo más tarde." +"El cliente y el servidor no están en condiciones de negociar la " +"autenticación. Por favor, intente acceder de nuevo más tarde." #: lib/casserver/controllers.rb:54 msgid "" "The server cannot fulfill this gateway request because no service parameter " "was given." -msgstr "El servidor no puede cumplir con esta petición, porque no fue parámetro de " +msgstr "" +"El servidor no puede cumplir con esta petición, porque no fue parámetro de " "servicio prestado." #: lib/casserver/controllers.rb:59 lib/casserver/controllers.rb:195 @@ -42,8 +66,9 @@ msgid "" "The target service your browser supplied appears to be invalid. Please " "contact your system administrator for help." msgstr "" -"El objetivo de su navegador de servicios ofrecidos parece ser nula. Por favor, " -"póngase en contacto con el administrador del sistema para obtener ayuda." +"El objetivo de su navegador de servicios ofrecidos parece ser nula. Por " +"favor, póngase en contacto con el administrador del sistema para obtener " +"ayuda." #: lib/casserver/controllers.rb:88 msgid "" @@ -61,30 +86,30 @@ msgstr "Inicio de sesión satisfactorio." msgid "Incorrect username or password." msgstr "Incorrecto nombre de usuario o contraseña." -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "Cierre de sesión satisfactorio." -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " Por favor, haga clic en el vínculo siguiente para continuar:" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." msgstr "Para generar un ticket de acceso, usted debe hacer una petición POST." -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " Servicio de Autenticación Central" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "Usuario" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "Contraseña" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "INICIAR SESIÓN" po/es_ES/rubycas-server.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: RubyCAS-Server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"Project-Id-Version: rubycas-server \n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-11-12 11:53-0500\n" "Last-Translator: Matt Zukowski <mzukowski@urbacon.net>\n" "Language-Team: French\n" @@ -16,26 +16,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." msgstr "" -"Vous êtes actuellement connecté en tant que '% s'. Si ce n'est pas vous, s'il vous plaît connectez-vous ci-dessous." +"Vous êtes actuellement connecté en tant que '% s'. Si ce n'est pas vous, " +"s'il vous plaît connectez-vous ci-dessous." #: lib/casserver/controllers.rb:37 msgid "" "The client and server are unable to negotiate authentication. Please try " "logging in again later." msgstr "" -"Le client et le serveur sont incapables de négocier l'authentification. S'il vous " -"plaît essayez de vous connecter à nouveau plus tard." +"Le client et le serveur sont incapables de négocier l'authentification. S'il " +"vous plaît essayez de vous connecter à nouveau plus tard." #: lib/casserver/controllers.rb:54 msgid "" "The server cannot fulfill this gateway request because no service parameter " "was given." msgstr "" -"Le serveur ne peut pas répondre à cette demande (pas de 'service' paramètre a été donné)." +"Le serveur ne peut pas répondre à cette demande (pas de 'service' paramètre " +"a été donné)." #: lib/casserver/controllers.rb:59 lib/casserver/controllers.rb:195 msgid "" @@ -50,41 +74,43 @@ msgid "" "Could not guess the CAS login URI. Please supply a submitToURI parameter " "with your request." msgstr "" -"Impossible de deviner le CAS de connexion URI. S'il vous plaît fournir une submitToURI paramètre " -"à votre demande." +"Impossible de deviner le CAS de connexion URI. S'il vous plaît fournir une " +"submitToURI paramètre à votre demande." #: lib/casserver/controllers.rb:184 msgid "You have successfully logged in." -msgstr "Vous vous êtes authentifié(e) auprès du Service Central d'Authentification." +msgstr "" +"Vous vous êtes authentifié(e) auprès du Service Central d'Authentification." #: lib/casserver/controllers.rb:200 msgid "Incorrect username or password." msgstr "Les informations transmises n'ont pas permis de vous authentifier" -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "Vous vous êtes déconnecté(e) du Service Central d'Authentification." -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " S'il vous plaît cliquer sur le lien suivant pour continuer:" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." -msgstr "Pour générer un ticket de connexion, vous devez faire une requête POST." +msgstr "" +"Pour générer un ticket de connexion, vous devez faire une requête POST." -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " Service Central d'Authentification." -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "Identifiant" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "Mot de passe" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "SE CONNECTER" po/fr_FR/rubycas-server.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: RubyCAS-Server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"Project-Id-Version: rubycas-server \n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-11-12 13:04-0500\n" "Last-Translator: Matt Zukowski <mzukowski@urbacon.net>\n" "Language-Team: Japanese\n" @@ -16,44 +16,70 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + # THIS IS MACHINE-TRANSLATED AND PROBABLY MAKES VERY LITTLE SENSE IN JAPANESE :) # HELP IN CORRECTING THIS WOULD BE GREATLY APPRECIATED. # この機械的に翻訳すると、おそらくほとんど意味です日本語 :) # これを修正するのに役立つ高く評価されるだろう。 - #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." msgstr "" -"'%s'としてログインしています。違うユーザーでログインするには下に入力してください。" +"'%s'としてログインしています。違うユーザーでログインするには下に入力してくだ" +"さい。" #: lib/casserver/controllers.rb:37 msgid "" "The client and server are unable to negotiate authentication. Please try " "logging in again later." msgstr "" -"クライアントとサーバー間で認証ができませんでした。しばらくしてから再度ログインしてください。" +"クライアントとサーバー間で認証ができませんでした。しばらくしてから再度ログイ" +"ンしてください。" #: lib/casserver/controllers.rb:54 msgid "" "The server cannot fulfill this gateway request because no service parameter " "was given." msgstr "" -"サービスパラメーターが指定されていないので、サーバーはゲートウェイリクエストを満たす事ができません。" +"サービスパラメーターが指定されていないので、サーバーはゲートウェイリクエスト" +"を満たす事ができません。" #: lib/casserver/controllers.rb:59 lib/casserver/controllers.rb:195 msgid "" "The target service your browser supplied appears to be invalid. Please " "contact your system administrator for help." msgstr "" -"ブラウザが示す対象サービスは無効のようです。システム管理者に連絡してください。" +"ブラウザが示す対象サービスは無効のようです。システム管理者に連絡してくださ" +"い。" #: lib/casserver/controllers.rb:88 msgid "" "Could not guess the CAS login URI. Please supply a submitToURI parameter " "with your request." msgstr "" -"CASのURIを推測することができませんでした。リクエストにsubmitToURIパラメータを指定してください。" +"CASのURIを推測することができませんでした。リクエストにsubmitToURIパラメータを" +"指定してください。" #: lib/casserver/controllers.rb:184 msgid "You have successfully logged in." @@ -63,30 +89,30 @@ msgstr "ログインしました" msgid "Incorrect username or password." msgstr "ユーザー名またはパスワードが間違っています" -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "ログアウトしました。" -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " 継続するには、以下のリンクをクリックしてください：" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." msgstr "ログインチケットを発行するには、POSTリクエストを送る必要があります。" -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " 統合ログイン" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "ユーザー名" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "パスワード" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "ログイン" po/ja_JP/rubycas-server.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rubycas-server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-11-12 11:03-0500\n" "Last-Translator: Matt Zukowski <mzukowski@urbacon.net>\n" "Language-Team: Polish\n" @@ -17,6 +17,28 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." @@ -62,32 +84,32 @@ msgstr "Jesteś zalogowany." #: lib/casserver/controllers.rb:200 msgid "Incorrect username or password." -msgstr "Niepoprawna użytkownik lub hasło." +msgstr "Niepoprawny użytkownik lub hasło." -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "Jesteś wylogowany." -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " Proszę kliknąć na poniższy link, aby kontynuować:" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." msgstr "Aby wygenerować login bilet, musisz złożyć żądanie POST." -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " Centralna Usługa Uwierzytelniania" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "Użytkownik" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "Hasło" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "ZALOGUJ" po/pl_PL/rubycas-server.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rubycas-server \n" -"POT-Creation-Date: 2009-03-17 11:43-0500\n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2009-03-17 20:55+0200\n" "Last-Translator: Kivanio Barbosa <kivanio@gmail.com>\n" "Language-Team: Brazil\n" @@ -16,40 +16,66 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." -msgstr "Você está logado como '%s'. Se este não for você, Por favor, faça o login a baixo." +msgstr "" +"Você está logado como '%s'. Se este não for você, Por favor, faça o login a " +"baixo." #: lib/casserver/controllers.rb:37 msgid "" "The client and server are unable to negotiate authentication. Please try " "logging in again later." msgstr "" -"O cliente e o servidor não puderam efetuar a autenticação. Por favor, " -"tente novamente mais tarde." +"O cliente e o servidor não puderam efetuar a autenticação. Por favor, tente " +"novamente mais tarde." #: lib/casserver/controllers.rb:54 msgid "" "The server cannot fulfill this gateway request because no service parameter " "was given." -msgstr "O servidor não pode completar a solicitação porque não foi enviado o paramêtro do serviço." +msgstr "" +"O servidor não pode completar a solicitação porque não foi enviado o " +"paramêtro do serviço." #: lib/casserver/controllers.rb:59 lib/casserver/controllers.rb:195 msgid "" "The target service your browser supplied appears to be invalid. Please " "contact your system administrator for help." msgstr "" -"O seu navegador está aparentemente com problemas. Por favor, " -"contate o administrador do sistema para obter ajuda." +"O seu navegador está aparentemente com problemas. Por favor, contate o " +"administrador do sistema para obter ajuda." #: lib/casserver/controllers.rb:88 msgid "" "Could not guess the CAS login URI. Please supply a submitToURI parameter " "with your request." msgstr "" -"Não encontramos a URI de acesso ao CAS. Por favor, informe corretamente no submitToURI " -"com sua solicitação." +"Não encontramos a URI de acesso ao CAS. Por favor, informe corretamente no " +"submitToURI com sua solicitação." #: lib/casserver/controllers.rb:184 msgid "You have successfully logged in." @@ -59,30 +85,31 @@ msgstr "Login efetuado com sucesso." msgid "Incorrect username or password." msgstr "Usuário ou Senha está incorreto." -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "Você saiu do sistema com sucesso." -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " Por favor, clique no seguinte link para continuar:" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." -msgstr "Para gerar um ticket de acceso, você deve fazer uma requisição via POST." +msgstr "" +"Para gerar um ticket de acceso, você deve fazer uma requisição via POST." -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " Central de Autenticação" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "Usuário" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "Senha" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "ENTRAR" po/pt_BR/rubycas-server.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rubycas-server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-11-04 12:32+0200\n" "Last-Translator: Antono Vasiljev <antono.vasiljev@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -15,6 +15,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." @@ -59,30 +81,30 @@ msgstr "Вы успешно вошли." msgid "Incorrect username or password." msgstr "Неверное имя пользователя или пароль." -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "Вы успешно вышли." -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr " Перейдите по ссылке чтобы продолжить: " -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." msgstr "Чтобы сгенерировать входной билет вы должны делать POST запрос." -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr " Центральный вход" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "Логин" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "Пароль" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "Войти" po/ru_RU/rubycas-server.po @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# Copyright (C) 2009 of The Contributors (see project history on github.com) +# This file is distributed under the same license as the RubyCAS-Server package. +# Matt Zukowski, 2009. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: rubycas-server \n" -"POT-Creation-Date: 2008-11-12 11:43-0500\n" +"POT-Creation-Date: 2009-05-06 18:16-0400\n" "PO-Revision-Date: 2008-10-29 20:55+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,6 +16,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: lib/casserver/cas.rb:117 +msgid "" +"Your login request did not include a login ticket. There may be a problem " +"with the authentication system." +msgstr "" + +#: lib/casserver/cas.rb:121 +msgid "" +"The login ticket you provided has already been used up. Please try logging " +"in again." +msgstr "" + +#: lib/casserver/cas.rb:126 +msgid "You took too long to enter your credentials. Please try again." +msgstr "" + +#: lib/casserver/cas.rb:130 +msgid "" +"The login ticket you provided is invalid. There may be a problem with the " +"authentication system." +msgstr "" + #: lib/casserver/controllers.rb:32 msgid "" "You are currently logged in as '%s'. If this is not you, please log in below." @@ -53,30 +75,30 @@ msgstr "" msgid "Incorrect username or password." msgstr "" -#: lib/casserver/controllers.rb:259 +#: lib/casserver/controllers.rb:257 msgid "You have successfully logged out." msgstr "" -#: lib/casserver/controllers.rb:262 +#: lib/casserver/controllers.rb:260 msgid " Please click on the following link to continue:" msgstr "" -#: lib/casserver/controllers.rb:412 +#: lib/casserver/controllers.rb:410 msgid "To generate a login ticket, you must make a POST request." msgstr "" -#: lib/casserver/views.rb:41 lib/casserver/views.rb:111 +#: lib/casserver/views.rb:43 lib/casserver/views.rb:113 msgid " Central Login" msgstr "" -#: lib/casserver/views.rb:71 +#: lib/casserver/views.rb:73 msgid "Username" msgstr "" -#: lib/casserver/views.rb:80 +#: lib/casserver/views.rb:82 msgid "Password" msgstr "" -#: lib/casserver/views.rb:92 +#: lib/casserver/views.rb:94 msgid "LOGIN" msgstr "" po/rubycas-server.pot da04ff6542f68644089d27984e2d077da43ca518 zuk zuk@roughest.net http://github.com/gunark/rubycas-server/commit/3e04b57e6dabd024f302dc4e381c0474795aa1bf 3e04b57e6dabd024f302dc4e381c0474795aa1bf 2009-05-06T15:22:06-07:00 2009-05-06T15:22:06-07:00 localization should be working again abbe3f2d93d82a353114e4c08b4b3cfa870b6be4 zuk zuk@roughest.net