From 2dcedca7acc21bf1e5adf5a7ea5821fcb02da250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20J=C3=B6nsson?= Date: Wed, 4 Feb 2015 14:59:54 +0100 Subject: [PATCH] Translate home page, minus statistics string which currently is non-translateable and needs to be refactorized. --- .../src/main/resources/messages_en.properties | 26 +++++++++++++--- .../src/main/resources/messages_sv.properties | 30 +++++++++++++++---- .../main/webapp/WEB-INF/tags/aboutContent.tag | 4 +-- .../webapp/WEB-INF/tags/landingPageAbout.tag | 7 +++-- .../WEB-INF/tags/landingPageContact.tag | 10 +++---- .../webapp/WEB-INF/tags/landingPageStats.tag | 5 ++-- .../WEB-INF/tags/landingPageWelcome.tag | 8 ++--- .../src/main/webapp/WEB-INF/tags/topbar.tag | 20 ++++++------- .../src/main/webapp/WEB-INF/views/home.jsp | 1 + 9 files changed, 74 insertions(+), 37 deletions(-) diff --git a/openid-connect-server-webapp/src/main/resources/messages_en.properties b/openid-connect-server-webapp/src/main/resources/messages_en.properties index 16f904816..7bcd76eb8 100644 --- a/openid-connect-server-webapp/src/main/resources/messages_en.properties +++ b/openid-connect-server-webapp/src/main/resources/messages_en.properties @@ -1,7 +1,3 @@ -common.Edit=Edit -common.login=Log in -common.logout=Log out - about.title=About about.body=\ This OpenID Connect service is built from the MITREid Connect Open Source project, from \ @@ -15,8 +11,30 @@ There, you can submit bug reports, give feedback, or even contribute code patche statistics.title=Statistics home.title=Home +home.welcome=Welcome! +home.welcome.body=\ +OpenID Connect is an internet-scale federated identity protocol built on top of the OAuth2 authorization framework. \ +OpenID Connect lets you log into a remote site using your identity without exposing your credentials, like a username and password.

\ +

Learn more » +home.more=More +home.about=About +home.about.body=This OpenID Connect service is built from the MITREid Connect Open Source project, from \ +The MITRE Corporation and the MIT Kerberos and Internet Trust Consortium. +home.contact=Contact +home.contact.body=\ +For more information or support, contact the administrators of this system.

\ +

Email » +home.statistics=Current Statistics +home.statistics.loading=Loading... contact.title=Contact contact.body=To report bugs with the MITREid Connect software itself, use the \ GitHub issue tracker. \ For problems relating to this server, contact the server's administrator. + +topbar.about=About +topbar.contact=Contact +topbar.statistics=Statistics +topbar.home=Home +topbar.login=Log in +topbar.logout=Log ut \ No newline at end of file diff --git a/openid-connect-server-webapp/src/main/resources/messages_sv.properties b/openid-connect-server-webapp/src/main/resources/messages_sv.properties index db6a5b94d..edc475ffc 100644 --- a/openid-connect-server-webapp/src/main/resources/messages_sv.properties +++ b/openid-connect-server-webapp/src/main/resources/messages_sv.properties @@ -1,9 +1,4 @@ -common.Edit=Ändra - -common.login=Logga in -common.logout=Logga ut - -about.title=Om Tjänsten +about.title=Om tjänsten about.body=\ Denna OpenID Connect är baserad på öppen källkod ifrån projektet MITREid, skapat av \ The MITRE Corporation och MIT Kerberos and Internet Trust Consortium.\ @@ -16,9 +11,32 @@ Där kan du skicka in felrapporter, komma med återkoppling, eller till och med statistics.title=Statistik home.title=Hem +home.welcome=Wälkommen! +home.welcome.body=\ +OpenID Connect är ett internet-kapabelt federerat identitetsprotokoll byggt ovanpå autentiseringsramverket OAuth2. \ +OpenID Connect låter dig logga in på en webbplats med din identitet utan att avslöja dina inloggningshemligheter, som ett användarnamn och lösenord.

\ +

Lär dig mer » +home.more=Mer +home.about=Om tjänsten +home.about.body=\ +Denna OpenID Connect tjänst är byggd från det öpnna källkodsprojektet MITREid, av \ +The MITRE Corporation och MIT Kerberos and Internet Trust Consortium. +home.contact=Kontakt +home.contact.body=\ +För mer information eller användarstöd, kontakta administratörerna av detta system.

\ +

E-post » +home.statistics=Nuvarande statistik +home.statistics.loading=Laddar... contact.title=Kontakt contact.body=\ För att rapportera fel i själva programvaran MITREid Connect, använd \ GitHub issue tracker. \ För problem som är specifika för denna server, kontakta tjänstens administrator. + +topbar.about=Om tjänsten +topbar.contact=Kontakt +topbar.statistics=Statistik +topbar.home=Hem +topbar.login=Logga in +topbar.logout=Logga ut \ No newline at end of file diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag index da7f1f66d..13eae2ec6 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag @@ -1,5 +1,5 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -

+

- +

\ No newline at end of file diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag index 7c9c72f15..eb5a5e634 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag @@ -1,5 +1,6 @@ -

About

+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +

-

This OpenID Connect service is built from the MITREid Connect Open Source project, from The MITRE Corporation and the MIT Kerberos and Internet Trust Consortium.

+

-

More »

+

»

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag index 5d46247d2..77960df92 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag @@ -1,5 +1,5 @@ -

Contact

- -

For more information or support, contact the administrators of this system.

- -

Email »

+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +

+

+ +

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag index 9c48a3c6f..085aafcf2 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag @@ -1,6 +1,7 @@ -

Current Statistics

+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +

-

Loading statistics...

+

There have been ? user diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag index cdd991ffd..fc35394cb 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag @@ -1,11 +1,9 @@ +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>

-

Welcome!

- -

OpenID Connect is an internet-scale federated identity protocol built on top of the OAuth2 authorization framework. OpenID Connect lets you log into a remote site using your identity without exposing your credentials, like a username and password.

- -

Learn more »

+

+

\ No newline at end of file diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag index f2ec1b083..5891648ce 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag @@ -40,34 +40,34 @@ diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp index f7615f2dc..4153385eb 100644 --- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp +++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp @@ -1,5 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>