Merge branch 'v2.0'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm

@@ -38,7 +38,7 @@ sub addRoutes {
 
     # Parse Diff activation rule
     $self->logger->debug(
-        "Diff activation rule -> " . $self->{viewerAllowDiff} );
+        "Diff activation rule -> " . ( $self->{viewerAllowDiff} // 0 ) );
     my $rule = $hd->buildSub( $hd->substitute( $self->{viewerAllowDiff} ) );
     unless ($rule) {
         $self->error(
@@ -49,7 +49,7 @@ sub addRoutes {
 
     # Parse Browser activation rule
     $self->logger->debug(
-        "Browser activation rule -> " . $self->{viewerAllowBrowser} );
+        "Browser activation rule -> " . ( $self->{viewerAllowBrowser} // 0 ) );
     $rule = $hd->buildSub( $hd->substitute( $self->{viewerAllowBrowser} ) );
     unless ($rule) {
         $self->error(

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -124,7 +124,7 @@
 "casSrv":"خادم كاس",
 "casSrvMetaDataExportedVars":"السمات المصدرة",
 "casSrvMetaDataOptions":"الخيارات",
-"casSrvMetaDataOptionsDisplay":"Display",
+"casSrvMetaDataOptionsDisplay":"عرض",
 "casSrvMetaDataOptionsDisplayName":"الاسم المطلوب عرضه",
 "casSrvMetaDataOptionsGateway":"بوابة إثبات الهوية",
 "casSrvMetaDataOptionsIcon":"مسارالأيقونة",

lemonldap-ng-portal/site/htdocs/static/languages/zh.json

@@ -146,7 +146,7 @@
 "generatePwd":"自动生成密码",
 "gotNewMessages":"您有一些新消息",
 "goToPortal":"回到首页",
-"gplSoft":"free software covered by the GPL license",
+"gplSoft":"受GPL协议保护的自由软件",
 "groups_sso":"SSO GROUPS",
 "headers":"HEADERS",
 "id":"Id",
@@ -157,43 +157,43 @@
 "lastFailedLogins":"上次失败的认证",
 "lastLogins":"上次登陆",
 "lastName":"姓氏",
-"linkValidUntil":"This message contains a link to reset your password, this link is valid until ",
+"linkValidUntil":"此消息包含重置您密码的链接，该链接有效期截至",
 "loginHistory":"登陆记录",
 "login":"登陆",
 "logout":"注销登录",
 "logoutConfirm":"您想注销登录吗？",
 "logoutFromOtherApp":"Logout from other applications ...",
 "logoutFromSP":"Logout from service providers ...",
-"macros":"MACROS",
+"macros":"宏",
 "mail":"邮件",
 "mailSent2":"已经发送一封邮件到您的邮箱",
-"maintenanceMode":"This application is in maintenance, please try to connect later",
+"maintenanceMode":"程序维护中，请稍后再尝试连接。",
 "maxNumberof2FDevicesReached":"Maximum number of 2F devices reached!!!",
 "missingCode":"Code is missing",
-"name":"Name",
+"name":"名字",
 "newMessages":"新消息",
 "newPassword":"新密码",
 "newPwdSentTo":"确认邮件已发送至您的邮箱",
 "noHistory":"欢迎，这是您的首次登陆",
-"notAuthorized":"You're not authorized to do this",
-"notFound":"Not found: you try to access to an unavailable page",
+"notAuthorized":"您没有权限进行该项操作",
+"notFound":"无法找到：您请求的网页不存在。",
 "noTOTPFound":"No TOTP found",
 "noU2FKeyFound":"No U2F key found",
 "oidcConsent":"The application %s would like to know:",
 "oidcConsents":"OIDC consents",
 "oidcConsentsFull":"OpenID-Connect consents",
-"openidAp":"Do you agree to provide the following parameters?",
+"openidAp":"您是否同意提供以下参数?",
 "openIdExample":"例如：http://myopenid.org/toto",
 "openidExchange":"Do you want to authenticate yourself on %s ?",
-"openidPA":"Data usage policy is available at",
+"openidPA":"数据使用条约可在此处了解",
 "openidRpns":"Parameter %s requested for federation isn't available",
 "openSessionSpace":"This space allow you to open a SSO session. This will help you to securely access to all applications authorized by your profil.",
 "openSSOSession":"Open your SSO session",
 "otherSessions":"Other active sessions",
 "password":"密码",
 "ppGrace":"authentications remaining, change your password!",
-"proxyError":"Bad gateway: unable to join remote server",
-"pwdChange":"Password change",
+"proxyError":"错误的网关：无法连接远程服务器",
+"pwdChange":"更改密码",
 "pwd":"密码",
 "pwdResetAlreadyIssued":"A password reset request was already issued on ",
 "pwdWillExpire":"距离密码失效还有 %d 天, %d 小时, %d 分钟, %d 秒, 请修改!",
@@ -201,28 +201,28 @@
 "redirectedIn":"您将30秒后重定向",
 "redirectionInProgres":"重定向进行中",
 "redirectionToIdp":"重定向至你的Identity Provider",
-"refreshrights":"Refresh my rights",
+"refreshrights":"刷新我的权限",
 "refuse":"拒绝",
 "register":"注册",
-"registerRequestAlreadyIssued":"A register request for this account was already issued on ",
+"registerRequestAlreadyIssued":"此账户已存在一个注册请求",
 "rememberChoice":"记住我的选择",
 "removeOtherSessions":"移除其他会话",
 "resendConfirmMail":"重新发送确认邮件？",
-"resentConfirm":"Do you want the confirmation mail to be resent?",
+"resentConfirm":"您想确认邮件被重新发送吗？",
 "resetPwd":"重置我的密码",
-"rightsReloadNeedsLogout":"Rights reloads need to logout and login again",
+"rightsReloadNeedsLogout":"重新加载权限需要登出并且再次登录",
 "scope":"Scope",
-"search":"Search",
+"search":"搜索",
 "selectIdP":"Select your Identity Provider",
-"service":"Service",
-"sendPwd":"Send me a link",
+"service":"服务",
+"sendPwd":"发给我一个链接",
 "serverError":"Error occurs on the server",
-"serviceProvidedBy":"Service provided by",
-"sessionsDeleted":"The following sessions have been closed",
+"serviceProvidedBy":"服务提供者为",
+"sessionsDeleted":"下列时域已被关闭",
 "sfaManager":"2ndFA Manager",
 "spoofId":"Spoofed Id",
 "SSOSessionInactive":"SSO session inactive",
-"stayConnected":"Stay connected on this device",
+"stayConnected":"在该项设备上保持连接",
 "submit":"提交",
 "totpExistingKey":"A TOTP secret already exists",
 "touchU2fDevice":"Please touch the flashing U2F device now.",
@@ -232,7 +232,7 @@
 "u2fPermission":"You may be prompted to allow the site permission to access your security keys. After granting permission, the device will start to blink.",
 "u2fWelcome":"U2F device management",
 "unableToGetKey":"Unable to access to your key. Retry or contact your administrator",
-"unknownAction":"Unknown action",
+"unknownAction":"未知操作",
 "unregister":"Unregister",
 "updateCdc":"更新通用域的Cookie",
 "upgradeSession":"升级会话",