Parcourir la source

English support

shimingxy il y a 5 ans
Parent
commit
1ce23fbb2c

+ 19 - 2
maxkey-web-maxkey/src/main/resources/messages/message.properties

@@ -1,6 +1,6 @@
 global.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF
 global.change.language=\u8BED\u97F3\u9009\u62E9
-global.change.language.en=\u82F1\u6587
+global.change.language.en=English
 global.change.language.zh=\u4E2D\u6587
 global.text.welcome=\u6B22\u8FCE\u60A8
 global.text.manage=\u7BA1\u7406
@@ -202,4 +202,21 @@ log.operate.message=\u6D88\u606F
 log.operate.content=\u5185\u5BB9
 log.operate.messageType=\u6D88\u606F\u7C7B\u578B
 log.operate.operateType=\u64CD\u4F5C\u7C7B\u578B
-log.operate.username=\u64CD\u4F5C\u4EBA
+log.operate.username=\u64CD\u4F5C\u4EBA
+
+
+menu.mypps=\u6211\u7684\u5E94\u7528
+menu.setting=\u8BBE\u7F6E
+menu.setting.security=\u5B89\u5168\u8BBE\u7F6E
+menu.setting.sociallink=\u8BA4\u8BC1\u5173\u8054
+menu.setting.changepassword=\u5BC6\u7801\u4FEE\u6539
+menu.setting.apppassword=\u5E94\u7528\u767B\u5F55\u5BC6\u7801
+menu.setting.appsetting=\u5E94\u7528\u914D\u7F6E
+menu.setting.timetoken=\u65F6\u95F4\u4EE4\u724C
+
+menu.myprofile=\u6211\u7684\u8D44\u6599
+
+menu.audit=\u5BA1\u8BA1
+menu.audit.login=\u767B\u5F55\u65E5\u5FD7
+menu.audit.signon=\u8BBF\u95EE\u65E5\u5FD7
+menu.audit.operation=\u64CD\u4F5C\u65E5\u5FD7

+ 224 - 0
maxkey-web-maxkey/src/main/resources/messages/message_en.properties

@@ -0,0 +1,224 @@
+global.application=MaxKey Secure Sign-on System
+global.change.language=Language
+global.change.language.en=English
+global.change.language.zh=\u4E2D\u6587
+global.text.welcome=Welcome
+global.text.manage=Manage
+global.text.copyright=CopyRight
+global.text.copyright.content=Copyright 2018-2019 shimingxy@163.com  Licensed under the Apache License, Version 2.0
+global.text.logout=Logout
+global.logout.tip=Tip
+global.logout.text.suffix=re-login 
+global.logout.text.prefix=You have successfully logged out. Please close your browser or 
+login.session.timeout.tip=Login session timeout
+login.session.timeout.prefix=Your login session has timed out. Please
+login.session.timeout.suffix=re-login 
+
+common.window.title=Window
+common.alert.title=Information
+common.alert.closeText=Close
+common.conform.title=Conform
+common.conform.yes=YES
+common.conform.no=NO
+common.select.hintText=Please select the record
+common.delete.hintText=Are you sure you want to delete?
+common.grid.loadtext=Data loading ...
+common.grid.loadnodata=No matching data found
+common.submit.hintText=Are you sure you want to do this?
+common.submit.errorText=Failed to perform operation
+common.text.startdate=StartDate
+common.text.enddate=EndDate
+common.text.createdby=CreatedBy
+common.text.createddate=CreatedDate
+common.text.modifiedby=ModifiedBy
+common.text.modifieddate=ModifiedDate
+		
+login.text.login.twofactor.obtain.valid=Regain
+login.text.login.twofactor.obtain=Get dynamic verification code
+login.text.login.twofactor.obtain.valid.unit=seconds
+login.text.login.twofactor.validTime=Remaining
+login.text.login.twofactor.validTime.unit=seconds
+login.text.login.twofactor=Two-Factors
+login.text.login.normal=Normal Login
+login.text.username=Username
+login.text.password=Password
+login.text.captcha=CAPTCHA
+login.text.remeberme=RemeberMe
+login.text.forgotpassword=Forgot Password
+login.button.login=Login
+login.text.currenttime=CurrentTime
+login.text.otherlogins=OtherLogins
+login.text.register=Register
+
+login.password.expired=Password Expired
+login.password.expired.tip=Password expired, please change password
+login.password.oldPassword=OldPassword
+login.password.newPassword=NewPassword
+login.password.confirmPassword=ConfirmPassword
+login.password.initial.change.tip=For the first time, please change the initialization password
+login.password.changepassword=Password
+login.password.applogin.changepassword=login password settings
+
+login.social.link=Link
+login.social.unlink=UnLink
+login.social.icon=Icon
+login.social.provider=Provider
+
+userinfo.displayName=displayName
+userinfo.username=username
+userinfo.email=email
+userinfo.mobile=mobile
+userinfo.userType=userType
+userinfo.picture=picture
+userinfo.familyName=familyName
+userinfo.givenName=givenName
+userinfo.middleName=middleName
+userinfo.nickName=nickName
+userinfo.gender=gender
+userinfo.gender.female=female
+userinfo.gender.male=male
+userinfo.married=married
+userinfo.married.unknown=unknown
+userinfo.married.single=single
+userinfo.married.married=married
+userinfo.married.divorce=divorce
+userinfo.married.widowed=widowed
+userinfo.website=website
+userinfo.idtype=idtype
+userinfo.idtype.unknown=unknown
+userinfo.idtype.idcard=idcard
+userinfo.idtype.passport=passport
+userinfo.idtype.studentcard=studentcard
+userinfo.idtype.militarycard=militarycard
+userinfo.idCardNo=idCardNo
+userinfo.startWorkDate=startWorkDate
+userinfo.preferredLanguage=preferredLanguage
+userinfo.timeZone=timeZone
+userinfo.locale=locale
+userinfo.employeeNumber=employeeNumber
+userinfo.windowsAccount=windowsAccount
+userinfo.organization=organization
+userinfo.division=division
+userinfo.department=department
+userinfo.costCenter=costCenter
+userinfo.jobTitle=jobTitle
+userinfo.jobLevel=jobLevel
+userinfo.manager=manager
+userinfo.assistant=assistant
+userinfo.entryDate=entryDate
+userinfo.quitDate=quitDate
+userinfo.workCountry=workCountry
+userinfo.workRegion=workRegion
+userinfo.workLocality=workLocality
+userinfo.workStreetAddress=workStreetAddress
+userinfo.workPostalCode=workPostalCode
+userinfo.workFax=workFax
+userinfo.workPhoneNumber=workPhoneNumber
+userinfo.workEmail=workEmail
+userinfo.homeCountry=homeCountry
+userinfo.homeRegion=homeRegion
+userinfo.homeLocality=homeLocality
+userinfo.homeStreetAddress=homeStreetAddress
+userinfo.homePostalCode=homePostalCode
+userinfo.homeFax=homeFax
+userinfo.homePhoneNumber=homePhoneNumber
+userinfo.homeEmail=homeEmail
+
+
+userinfo.authnType=AuthenticationType
+userinfo.authnType.authnType.1=General login
+userinfo.authnType.authnType.2=Mobile Token
+userinfo.authnType.authnType.3=SMS Verification
+userinfo.authnType.authnType.4=EMAIL Verification
+userinfo.authnType.authnType.5=TIME BASED Token
+userinfo.authnType.authnType.6=Counter Token
+userinfo.authnType.authnType.7=HOTP Token
+userinfo.authnType.authnType.8=RSA Token
+userinfo.authnType.authnType.9=Digital Certificate
+userinfo.authnType.authnType.10=USB Key
+
+login.totp.sharedSecret=sharedSecret
+login.totp.period=period
+login.totp.digits=digits
+login.totp.crypto=crypto
+login.totp.generate=Generate
+login.totp.title=TimeBased One Time Password
+
+login.hotp.sharedSecret=sharedSecret
+login.hotp.period=period
+login.hotp.digits=digits
+login.hotp.crypto=crypto
+login.hotp.generate=Generate
+login.hotp.title=HOTP One Time Password
+
+login.counter.sharedSecret=sharedSecret
+login.counter.period=period
+login.counter.digits=digits
+login.counter.crypto=crypto
+login.counter.generate=generate
+login.counter.title=Counter Based One Time Password
+
+apps.icon=Icon
+apps.name=appName
+apps.protocol=protocol
+apps.category=category
+
+button.text.action=Action
+button.text.visit=Visit
+button.text.save=Save
+button.text.select=Select
+button.text.search=Search
+button.text.expandsearch=Expand
+button.text.collapsesearch=Collapse
+
+log.loginhistory.id=id
+log.loginhistory.sessionId=sessionId
+log.loginhistory.username=username
+log.loginhistory.displayName=displayName
+log.loginhistory.provider=provider
+log.loginhistory.message=message
+log.loginhistory.loginType=loginType
+log.loginhistory.sourceIp=sourceIp
+log.loginhistory.browser=browser
+log.loginhistory.loginTime=loginTime
+log.loginhistory.logoutTime=logoutTime
+log.loginhistory.platform=platform
+log.loginhistory.application=application
+log.loginhistory.loginUrl=loginUrl
+log.loginhistory.code=code
+log.loginhistory.rpUserInfo=Relying Party
+
+log.loginappshistory.id=id
+log.loginappshistory.sessionId=sessionId
+log.loginappshistory.uid=uid
+log.loginappshistory.username=username
+log.loginappshistory.displayName=displayName
+log.loginappshistory.appId=appId
+log.loginappshistory.appName=appName
+log.loginappshistory.loginTime=loginTime
+
+log.operate.servicename=servicename
+log.operate.message=message
+log.operate.content=content
+log.operate.messageType=messageType
+log.operate.operateType=operateType
+log.operate.username=username
+
+
+menu.mypps=My Apps
+menu.setting=Settings
+menu.setting.security=Security
+menu.setting.sociallink=SocialLink
+menu.setting.changepassword=ChangePassword
+menu.setting.apppassword=AppsPassword
+menu.setting.appsetting=AppsSettings
+menu.setting.timetoken=Timetoken
+
+menu.myprofile=My Profile
+
+menu.audit=Audit
+menu.audit.login=Login
+menu.audit.signon=Sign-on
+menu.audit.operation=Operation
+
+

+ 26 - 14
maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl

@@ -2,63 +2,75 @@
 <div id="nav_primary"  class="menuprimary">
 	<ul >
 		<li  id="nav_primay_11"  class="nav_primay_level primaryleft"  xpath="">
-			<a   href="<@base/>/appList">我的应用</a>
+			<!--我的应用-->
+			<a   href="<@base/>/appList"><@locale code="menu.mypps"/></a>
 		</li>
 		<li  id="nav_primay_13"  class="nav_primay_level primaryleft"  xpath="">
-			<a   href="<@base/>/safe/forward/setting">安全设置</a>
+			<!--安全设置-->
+			<a   href="<@base/>/safe/forward/setting"><@locale code="menu.setting"/></a>
 			<div id="nav_child_1301"  class="nav_second_child">
 				<ul>
+					<!--安全设置-->
 					<li id="nav_second_1301" class="nav_second_level">
-						<a   href="<@base/>/safe/forward/setting">安全设置</a>
+						<a   href="<@base/>/safe/forward/setting"><@locale code="menu.setting.security"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--认证关联-->
 					<li id="nav_second_1301" class="nav_second_level">
-						<a   href="<@base/>/socialsignon/list">认证关联</a>
+						<a   href="<@base/>/socialsignon/list"><@locale code="menu.setting.sociallink"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--密码修改-->
 					<li id="nav_second_1302" class="nav_second_level">
-						<a   href="<@base/>/safe/forward/changePasswod">密码修改</a>
+						<a   href="<@base/>/safe/forward/changePasswod"><@locale code="menu.setting.changepassword"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--应用登录密码-->
 					<li id="nav_second_1303" class="nav_second_level">
-						<a   href="<@base/>/safe/forward/changeAppLoginPasswod">应用登录密码</a>
+						<a   href="<@base/>/safe/forward/changeAppLoginPasswod"><@locale code="menu.setting.apppassword"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--应用配置-->
 					<li id="nav_second_1304" class="nav_second_level">
-						<a   href="<@base/>/appConfigList">应用配置</a>
+						<a   href="<@base/>/appConfigList"><@locale code="menu.setting.appsetting"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--时间令牌-->
 					<li id="nav_second_1305" class="nav_second_level">
-						<a   href="<@base/>/safe/otp/timebased">时间令牌</a>
+						<a   href="<@base/>/safe/otp/timebased"><@locale code="menu.setting.timetoken"/></a>
 					</li>
 				</ul>
 			</div>
 		</li>
-		
+		<!--我的资料-->
 		<li  id="nav_primay_14"  class="nav_primay_level primaryleft"  xpath="">
-			<a  href="<@base/>/profile/myProfile">我的资料</a>
+			<a  href="<@base/>/profile/myProfile"><@locale code="menu.myprofile"/></a>
 		</li>
+		<!--日志审计-->
 		<li  id="nav_primay_15"  class="nav_primay_level primaryleft"  xpath="">
-			<a   href="<@base/>/historys/login">日志审计</a>
+			<a   href="<@base/>/historys/login"><@locale code="menu.audit"/></a>
 			<div id="nav_child_1501"  class="nav_second_child">
 				<ul>
+					<!--登录日志-->
 					<li id="nav_second_1501" class="nav_second_level">
-						<a   href="<@base/>/historys/login">登录日志</a>
+						<a   href="<@base/>/historys/login"><@locale code="menu.audit.login"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--访问日志-->
 					<li id="nav_second_1502" class="nav_second_level">
-						<a   href="<@base/>/historys/loginApps">访问日志</a>
+						<a   href="<@base/>/historys/loginApps"><@locale code="menu.audit.signon"/></a>
 					</li>
 				</ul>
 				<ul>
+					<!--操作日志-->
 					<li id="nav_second_1503" class="nav_second_level">
-						<a   href="<@base/>/historys/logs">操作日志</a>
+						<a   href="<@base/>/historys/logs"><@locale code="menu.audit.operation"/></a>
 					</li>
 				</ul>
 			</div>

+ 2 - 2
maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl

@@ -1,8 +1,8 @@
 <div id="topBar"  > 
 	<div class="container">
 		<div style="float:left;margin-left:20px;margin-top: 5px;"><IMG SRC="<@base/>/static/images/logo.jpg" style="width:55px;heigth:55px"></div>
-		<div style="margin-top:15px;margin-left:10px;float:left">
-			<div style="letter-spacing:2px;font-size:28px;font-weight:bolder;"><@locale code="global.application"/></div>
+		<div style="margin-top:20px;margin-left:10px;float:left">
+			<div style="letter-spacing:2px;font-size:20px;font-weight:bolder;"><@locale code="global.application"/></div>
 			
 		</div>
 		<div style="margin-top:25px;margin-right:10px;float:right;">