From fc6259e793100b2e545fb58a47d277ffbbb7e353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=90=E5=B0=8F=E5=BF=83?= Date: Mon, 3 Jun 2019 03:17:49 +0800 Subject: [PATCH] =?UTF-8?q?1:=20Fix=20When=20the=20log=20is=20not=20found,?= =?UTF-8?q?=20the=20prompt=20is=20English.=202=EF=BC=9AFix=20When=20clicki?= =?UTF-8?q?ng=20the=20Refresh=20Log=20button=20is=20invalid.=20Set=20searc?= =?UTF-8?q?h=20box=20to=20null=20invalid=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 耐小心 --- src/portal/lib/src/log/recent-log.component.html | 4 ++-- src/portal/lib/src/log/recent-log.component.ts | 6 +++--- src/portal/src/i18n/lang/en-us-lang.json | 5 +++-- src/portal/src/i18n/lang/es-es-lang.json | 5 +++-- src/portal/src/i18n/lang/fr-fr-lang.json | 5 +++-- src/portal/src/i18n/lang/pt-br-lang.json | 9 +++++---- src/portal/src/i18n/lang/zh-cn-lang.json | 5 +++-- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/portal/lib/src/log/recent-log.component.html b/src/portal/lib/src/log/recent-log.component.html index e5cf0e3bc..467ba059b 100644 --- a/src/portal/lib/src/log/recent-log.component.html +++ b/src/portal/lib/src/log/recent-log.component.html @@ -25,7 +25,7 @@ {{'AUDIT_LOG.TAGS' | translate}} {{'AUDIT_LOG.OPERATION' | translate}} {{'AUDIT_LOG.TIMESTAMP' | translate}} - We couldn't find any logs! + {{ 'AUDIT_LOG.NOT_FOUND' | translate }} {{l.username}} {{l.repo_name}} @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/src/portal/lib/src/log/recent-log.component.ts b/src/portal/lib/src/log/recent-log.component.ts index b791e7bfb..83ccdff18 100644 --- a/src/portal/lib/src/log/recent-log.component.ts +++ b/src/portal/lib/src/log/recent-log.component.ts @@ -67,9 +67,9 @@ export class RecentLogComponent implements OnInit { } public doFilter(terms: string): void { - if (!terms) { - return; - } + // if (!terms) { + // return; + // } this.currentTerm = terms.trim(); // Trigger data loading and start from first page this.loading = true; diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 74f99e0e9..b81a029fe 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -360,7 +360,8 @@ "ITEMS": "items", "FILTER_PLACEHOLDER": "Filter Logs", "INVALID_DATE": "Invalid date.", - "OF": "of" + "OF": "of", + "NOT_FOUND": "We couldn't find any logs!" }, "REPLICATION": { "YES": "Yes", @@ -725,7 +726,7 @@ "LDAP_UID": "The attribute used in a search to match a user. It could be uid, cn, email, sAMAccountName or other attributes depending on your LDAP/AD.", "LDAP_SCOPE": "The scope to search for users.", "TOKEN_EXPIRATION": "The expiration time (in minutes) of a token created by the token service. Default is 30 minutes.", - "ROBOT_TOKEN_EXPIRATION": "The expiration time ( in days) of the token of the robot account, Default is 30 days. Show the number of days converted from minutes and rounds down", + "ROBOT_TOKEN_EXPIRATION": "The expiration time ( in days) of the token of the robot account, Default is 30 days. Show the number of days converted from minutes and rounds down", "PRO_CREATION_RESTRICTION": "The flag to define what users have permission to create projects. By default, everyone can create a project. Set to 'Admin Only' so that only an administrator can create a project.", "ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.", "SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index b99e31c3b..452172c3c 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -360,7 +360,8 @@ "ITEMS": "elementos", "FILTER_PLACEHOLDER": "Filtrar logs", "INVALID_DATE": "Fecha invalida.", - "OF": "of" + "OF": "of", + "NOT_FOUND": "No pudimos encontrar ningún registro!" }, "REPLICATION": { "YES": "Yes", @@ -725,7 +726,7 @@ "LDAP_UID": "El atributo usado en una búsqueda para encontrar un usuario. Debe ser el uid, cn, email, sAMAccountName u otro atributo dependiendo del LDAP/AD.", "LDAP_SCOPE": "El ámbito de búsqueda para usuarios", "TOKEN_EXPIRATION": "El tiempo de expiración (en minutos) del token creado por el servicio de tokens. Por defecto son 30 minutos.", - "ROBOT_TOKEN_EXPIRATION": "El tiempo de caducidad (días) del token de la cuenta del robot, el valor predeterminado es 30 días. Muestra el número de días convertidos de minutos y redondeos.", + "ROBOT_TOKEN_EXPIRATION": "El tiempo de caducidad (días) del token de la cuenta del robot, el valor predeterminado es 30 días. Muestra el número de días convertidos de minutos y redondeos.", "PRO_CREATION_RESTRICTION": "Marca para definir qué usuarios tienen permisos para crear proyectos. Por defecto, todos pueden crear proyectos. Seleccione 'Solo Administradores' para que solamente los administradores puedan crear proyectos.", "ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.", "SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index ae649aebb..d195caf1f 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -352,7 +352,8 @@ "ITEMS": "items", "FILTER_PLACEHOLDER": "Filtrer les Logs", "INVALID_DATE": "Date invalide.", - "OF": "de" + "OF": "de", + "NOT_FOUND": "Nous n'avons trouvé aucun journal!" }, "REPLICATION": { "YES": "Yes", @@ -706,7 +707,7 @@ "LDAP_UID": "Attribut utilisé dans une recherche pour trouver un utilisateur. Cela peut être uid, cn, email, sAMAccountName ou d'autres attributs selon votre LDAP/AD.", "LDAP_SCOPE": "Le scope de recherche des utilisateurs.", "TOKEN_EXPIRATION": "Le temps d'expiration (en minutes) d'un jeton créé par le service de jeton. La valeur par défaut est 30 minutes.", - "ROBOT_TOKEN_EXPIRATION": "Le délai d'expiration (en jours) du jeton du compte robot est défini par défaut sur 30 jours. Afficher le nombre de jours convertis à partir des minutes et des arrondis", + "ROBOT_TOKEN_EXPIRATION": "Le délai d'expiration (en jours) du jeton du compte robot est défini par défaut sur 30 jours. Afficher le nombre de jours convertis à partir des minutes et des arrondis", "PRO_CREATION_RESTRICTION": "L'indicateur pour définir quels utilisateurs ont le droit de créer des projets. Par défaut, tout le monde peut créer un projet. Définissez sur 'Administrateur Seulement' pour que seul un administrateur puisse créer un projet.", "ROOT_CERT_DOWNLOAD": "Téléchargez le certificat racine du dépôt.", "SCANNING_POLICY": "Définissez la politique d'analyse des images en fonction des différentes exigences. 'Aucune' : pas de politique active; 'Tousles jours à' : déclenchement du balayage à l'heure spécifiée tous les jours.", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index a829f8f18..70e26f9da 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -358,7 +358,8 @@ "ITEMS": "itens", "FILTER_PLACEHOLDER": "Filtrar Logs", "INVALID_DATE": "Data inválida.", - "OF": "de" + "OF": "de", + "NOT_FOUND": "Nós não encontramos nenhum registro!" }, "REPLICATION": { "YES": "Yes", @@ -719,7 +720,7 @@ "LDAP_UID": "O atributo utilizado na busca de um uusário. Pode ser uid, cn, email, sAMAccountName ou outro atributo dependendo LDAP/AD.", "LDAP_SCOPE": "O escopo de busca de usuários.", "TOKEN_EXPIRATION": "O tempo de expiração (em minutos) de um token criado pelo serviço de token. O padrão é 30 minutos.", - "ROBOT_TOKEN_EXPIRATION": "O tempo de expiração (dias) do token da conta do robô, o padrão é 30 dias. Mostra o número de dias convertidos de minutos e arredonda para baixo", + "ROBOT_TOKEN_EXPIRATION": "O tempo de expiração (dias) do token da conta do robô, o padrão é 30 dias. Mostra o número de dias convertidos de minutos e arredonda para baixo", "PRO_CREATION_RESTRICTION": "A opção para definir quais usuários possuem permissão de criar projetos. Por padrão, qualquer um pode criar projetos. Configure para 'Apenas Administradores' para que apenas Administradores possam criar projetos.", "ROOT_CERT_DOWNLOAD": "Baixar o certificado raiz do registry.", "SCANNING_POLICY": "Configura a política de análise das imagens baseado em diferentes requisitos. 'Nenhum': Nenhuma política ativa; 'Diariamente em': Dispara a análise diariamente no horário especificado.", @@ -987,7 +988,7 @@ "AT": "at", "NOSCHEDULE": "An error occurred in Get schedule" - }, + }, "GC": { "CURRENT_SCHEDULE": "Agendamento atual", "ON": "em", @@ -1009,5 +1010,5 @@ "TIP_TAG": "A tag is a label applied to a Docker image in a repository. Tags are how various images in a repository are distinguished from each other.It need to match Regex: (`[\\w][\\w.-]{0,127}`)" } - + } diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 0c0f71dcf..d43246e53 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -359,7 +359,8 @@ "ITEMS": "条记录", "FILTER_PLACEHOLDER": "过滤日志", "INVALID_DATE": "无效日期。", - "OF": "共计" + "OF": "共计", + "NOT_FOUND": "未发现任何日志!" }, "REPLICATION": { "YES": "是", @@ -725,7 +726,7 @@ "LDAP_UID": "在搜索中用来匹配用户的属性，可以是uid,cn,email,sAMAccountName或者其它LDAP/AD服务器支持的属性。", "LDAP_SCOPE": "搜索用户的范围。", "TOKEN_EXPIRATION": "由令牌服务创建的令牌的过期时间（分钟），默认为30分钟。", - "ROBOT_TOKEN_EXPIRATION": "机器人账户的令牌的过期时间（天），默认为30天,显示的结果为分钟转化的天数并向下取整。", + "ROBOT_TOKEN_EXPIRATION": "机器人账户的令牌的过期时间（天），默认为30天,显示的结果为分钟转化的天数并向下取整。", "PRO_CREATION_RESTRICTION": "用来确定哪些用户有权限创建项目，默认为’所有人‘，设置为’仅管理员‘则只有管理员可以创建项目。", "ROOT_CERT_DOWNLOAD": "下载镜像库根证书.", "SCANNING_POLICY": "基于不同需求设置镜像扫描策略。‘无’：不设置任何策略；‘每日定时’：每天在设置的时间定时执行扫描。",