openstack/skyline-console
Code Issues Proposed changes

feat: update tip for the user-domain input

Browse Source 
update the tips for the user-domain input in the login form

Change-Id: I51fbab2888710346b8590683bf245af9f7dbdc85
This commit is contained in:
zhangjingwei 2024-07-15 11:17:02 +08:00
parent a28eedf973
commit 3d9d596c67
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/locales/en.json
View File

@ -29,7 +29,7 @@
"5min": "5min",
"8 to 16 characters, at least one uppercase letter, one lowercase letter, one number.": "8 to 16 characters, at least one uppercase letter, one lowercase letter, one number.",
"8 to 32 characters, at least one uppercase letter, one lowercase letter, one number and one special character.": "8 to 32 characters, at least one uppercase letter, one lowercase letter, one number and one special character.",
"<username>@<domain name>": "<username>@<domain name>",
"<username> or <username>@<domain>": "<username> or <username>@<domain>",
"A command that will be sent to the container": "A command that will be sent to the container",
"A container with the same name already exists": "A container with the same name already exists",
"A dynamic scheduling algorithm that estimates the server load based on the number of currently active connections. The system allocates new connection requests to the server with the least number of current connections. Commonly used for long connection services, such as database connections and other services.": "A dynamic scheduling algorithm that estimates the server load based on the number of currently active connections. The system allocates new connection requests to the server with the least number of current connections. Commonly used for long connection services, such as database connections and other services.",
@ -1070,7 +1070,6 @@
"For GRE networks, valid segmentation IDs are 1 to 4294967295": "For GRE networks, valid segmentation IDs are 1 to 4294967295",
"For VLAN networks, valid segmentation IDs are 1 to 4094": "For VLAN networks, valid segmentation IDs are 1 to 4094",
"For VXLAN networks, valid segmentation IDs are 1 to 16777215": "For VXLAN networks, valid segmentation IDs are 1 to 16777215",
"For example: username@Default": "For example: username@Default",
"Forbidden": "Forbidden",
"Forbidden Domain": "Forbidden Domain",
"Forbidden Project": "Forbidden Project",
@ -1883,7 +1882,7 @@
"Please enter the server id to be reduced, and separate different id with \",\"": "Please enter the server id to be reduced, and separate different id with \",\"",
"Please fill in the peer network segment and subnet mask of CIDR format, the written subnets should be under the same router, one per line.": "Please fill in the peer network segment and subnet mask of CIDR format, the written subnets should be under the same router, one per line.",
"Please input": "Please input",
"Please input <username>@<domain name>!": "Please input <username>@<domain name>!",
"Please input <username> or <username>@<domain name>!": "Please input <username> or <username>@<domain name>!",
"Please input ICMP code(0-255)": "Please input ICMP code(0-255)",
"Please input ICMP type(0-255)": "Please input ICMP type(0-255)",
"Please input IPv4 or IPv6 cidr": "Please input IPv4 or IPv6 cidr",
@ -1916,7 +1915,7 @@
"Please input protocol number if it absent in select list.": "Please input protocol number if it absent in select list.",
"Please input provider": "Please input provider",
"Please input snapshot name": "Please input snapshot name",
"Please input the correct format: <username>@<domain name>.": "Please input the correct format: <username>@<domain name>.",
"Please input the correct format: <username> or <username>@<domain name>.": "Please input the correct format: <username> or <username>@<domain name>.",
"Please input transfer id": "Please input transfer id",
"Please input user name": "Please input user name",
"Please input value": "Please input value",
@ -2650,6 +2649,7 @@
"Time between running the check in seconds": "Time between running the check in seconds",
"Timeout(Minute)": "Timeout(Minute)",
"Timeout(s)": "Timeout(s)",
"Tips: without domain means \"Default\" domain.": "Tips: without domain means \"Default\" domain.",
"To open": "To open",
"Today CPU usage > 80% alert": "Today CPU usage > 80% alert",
"Today Memory usage > 80% alert": "Today Memory usage > 80% alert",

8
src/locales/ko-kr.json
View File

@ -29,7 +29,7 @@
"5min": "5분",
"8 to 16 characters, at least one uppercase letter, one lowercase letter, one number.": "8 ~ 16 문자, 최소 대문자 한개, 소문자 한개, 숫자 한개, 특수 문자 한개",
"8 to 32 characters, at least one uppercase letter, one lowercase letter, one number and one special character.": "8 ~ 32 문자, 최소 대문자 한개, 소문자 한개, 숫자 한개, 특수 문자 한개",
"<username>@<domain name>": "<사용자 이름>@<도메인 이름>",
"<username> or <username>@<domain>": "<사용자 이름> 또는 <사용자 이름>@<도메인>",
"A command that will be sent to the container": "컨테이너로 전송될 명령어",
"A container with the same name already exists": "동일한 이름의 컨테이너가 존재합니다.",
"A dynamic scheduling algorithm that estimates the server load based on the number of currently active connections. The system allocates new connection requests to the server with the least number of current connections. Commonly used for long connection services, such as database connections and other services.": "동적 스케쥴링 알고리즘은 현재 연결된 커넥션 수로 서버 로드를 예측합니다. 시스템은 최소 연결을 가진 서버로 새로운 연결을 할당합니다. 데이터베이스 연결 및 다른 서비스 처럼 오래 지속되는 연결을 갖는 서비스에 활용됩니다.",
@ -1070,7 +1070,6 @@
"For GRE networks, valid segmentation IDs are 1 to 4294967295": "GRE 네트워크의 경우, 유효한 segmentation ID는 1에서 4294967295까지 입니다.",
"For VLAN networks, valid segmentation IDs are 1 to 4094": "VLAN 네트워크의 경우, 유효한 segmentation ID는 1에서 4094까지 입니다.",
"For VXLAN networks, valid segmentation IDs are 1 to 16777215": "VXLAN 네트워크의 경우, 유효한 segmentation ID는 1에서 16777215까지 입니다.",
"For example: username@Default": "예: username@Default",
"Forbidden": "금지된",
"Forbidden Domain": "금지된 Domain",
"Forbidden Project": "금지된 Project",
@ -1883,7 +1882,7 @@
"Please enter the server id to be reduced, and separate different id with \",\"": "",
"Please fill in the peer network segment and subnet mask of CIDR format, the written subnets should be under the same router, one per line.": "",
"Please input": "",
"Please input <username>@<domain name>!": "<사용자 이름>@<도메인 이름>을 입력해주세요!",
"Please input <username> or <username>@<domain name>!": "<사용자 이름> 또는 <사용자 이름>@<도메인 이름>을 입력해주세요!",
"Please input ICMP code(0-255)": "",
"Please input ICMP type(0-255)": "",
"Please input IPv4 or IPv6 cidr": "",
@ -1916,7 +1915,7 @@
"Please input protocol number if it absent in select list.": "선택 목록에 없으면 프로토콜 번호를 입력하세요.",
"Please input provider": "제공자를 입력하세요.",
"Please input snapshot name": "snapshot 이름을 입력하세요.",
"Please input the correct format: <username>@<domain name>.": "올바른 형식(<사용자 이름>@<도메인 이름>)을 입력하세요.",
"Please input the correct format: <username> or <username>@<domain name>.": "올바른 형식(<사용자 이름> 또는 <사용자 이름>@<도메인 이름>)을 입력하십시오.",
"Please input transfer id": "전송 ID를 입력하세요.",
"Please input user name": "사용자 이름을 입력하세요.",
"Please input value": "값을 입력하세요.",
@ -2650,6 +2649,7 @@
"Time between running the check in seconds": "검사 간격(초)",
"Timeout(Minute)": "타임아웃(분)",
"Timeout(s)": "타임아웃(초)",
"Tips: without domain means \"Default\" domain.": "팁: 도메인이 없으면 \"Default\" 도메인을 의미합니다.",
"To open": "열기",
"Today CPU usage > 80% alert": "오늘 CPU 사용량 > 80% 경고",
"Today Memory usage > 80% alert": "오늘 메모리 사용량 > 80% 경고",

8
src/locales/ru.json
View File

@ -29,7 +29,7 @@
"5min": "5 минут",
"8 to 16 characters, at least one uppercase letter, one lowercase letter, one number.": "8 до 16 символов, как минимум одна заглавная буква, одна строчная буква и одна цифра.",
"8 to 32 characters, at least one uppercase letter, one lowercase letter, one number and one special character.": "",
"<username>@<domain name>": "<имя пользователя>@<имя домена>",
"<username> or <username>@<domain>": "<имя пользователя> или <имя пользователя>@<домен>",
"A command that will be sent to the container": "Команда, которая будет отправлена в контейнер",
"A container with the same name already exists": "Контейнер с таким же именем уже существует",
"A dynamic scheduling algorithm that estimates the server load based on the number of currently active connections. The system allocates new connection requests to the server with the least number of current connections. Commonly used for long connection services, such as database connections and other services.": "Динамический алгоритм планирования, который оценивает нагрузку сервера на основе количества активных соединений. Система выделяет новые запросы на соединение серверу с наименьшим количеством текущих соединений. Часто используется для долгосрочных сервисов с соединением, таких как подключения к базам данных и другие сервисы.",
@ -1070,7 +1070,6 @@
"For GRE networks, valid segmentation IDs are 1 to 4294967295": "Для сетей GRE допустимыми идентификаторами сегментации являются числа от 1 до 4294967295",
"For VLAN networks, valid segmentation IDs are 1 to 4094": "Для сетей VLAN допустимыми идентификаторами сегментации являются числа от 1 до 4094",
"For VXLAN networks, valid segmentation IDs are 1 to 16777215": "Для сетей VXLAN допустимыми идентификаторами сегментации являются числа от 1 до 16777215",
"For example: username@Default": "Например: username@Default",
"Forbidden": "Запрещено",
"Forbidden Domain": "Запрещен домен",
"Forbidden Project": "Запрещен проект",
@ -1883,7 +1882,7 @@
"Please enter the server id to be reduced, and separate different id with \",\"": "Пожалуйста, введите идентификатор сервера, который необходимо уменьшить, и разделите разные идентификаторы запятой \",\"",
"Please fill in the peer network segment and subnet mask of CIDR format, the written subnets should be under the same router, one per line.": "Пожалуйста, заполните сегмент сети пира и маску подсети в формате CIDR, написанные подсети должны быть под одним маршрутизатором, по одной на строку.",
"Please input": "Пожалуйста, введите",
"Please input <username>@<domain name>!": "Пожалуйста, введите <имя пользователя>@<имя домена>!",
"Please input <username> or <username>@<domain name>!": "Пожалуйста, введите <имя пользователя> или <имя пользователя>@<имя домена>!",
"Please input ICMP code(0-255)": "Пожалуйста, введите код ICMP (0-255)",
"Please input ICMP type(0-255)": "Пожалуйста, введите тип ICMP (0-255)",
"Please input IPv4 or IPv6 cidr": "Пожалуйста, введите CIDR IPv4 или IPv6",
@ -1916,7 +1915,7 @@
"Please input protocol number if it absent in select list.": "Пожалуйста, введите номер протокола, если его нет в списке выбора.",
"Please input provider": "Пожалуйста, введите провайдера",
"Please input snapshot name": "Пожалуйста, введите имя снимка",
"Please input the correct format: <username>@<domain name>.": "Пожалуйста, введите правильный формат: <имя пользователя>@<имя домена>.",
"Please input the correct format: <username> or <username>@<domain name>.": "Пожалуйста, введите правильный формат: <имя пользователя> или <имя пользователя>@<имя домена>.",
"Please input transfer id": "Пожалуйста, введите идентификатор передачи",
"Please input user name": "Пожалуйста, введите имя пользователя",
"Please input value": "Пожалуйста, введите значение",
@ -2650,6 +2649,7 @@
"Time between running the check in seconds": "Интервал выполнения проверки в секундах",
"Timeout(Minute)": "Тайм-аут (минуты)",
"Timeout(s)": "Тайм-аут (секунды)",
"Tips: without domain means \"Default\" domain.": "Советы: отсутствие домена означает домен «Default».",
"To open": "Открыть",
"Today CPU usage > 80% alert": "Сегодня предупреждение: использование CPU > 80%",
"Today Memory usage > 80% alert": "Сегодня предупреждение: использование памяти > 80%",

8
src/locales/tr-tr.json
View File

@ -29,7 +29,7 @@
"5min": "5 Dk",
"8 to 16 characters, at least one uppercase letter, one lowercase letter, one number.": "8 ile 16 karakter, en az bir büyük harf, en az bir küçük harf, en az bir rakam.",
"8 to 32 characters, at least one uppercase letter, one lowercase letter, one number and one special character.": "",
"<username>@<domain name>": "<kullanıcı adı>@<alan adı>",
"<username> or <username>@<domain>": "<kullanıcı adı> veya <kullanıcı adı>@<etki alanı>",
"A command that will be sent to the container": "Konteyner'a gönderilecek bir komut",
"A container with the same name already exists": "Aynı isme sahip bir konteyner bulunmaktadır.",
"A dynamic scheduling algorithm that estimates the server load based on the number of currently active connections. The system allocates new connection requests to the server with the least number of current connections. Commonly used for long connection services, such as database connections and other services.": "Dinamik zamanlama algoritması, sunucu yükünü o anda açık olan bağlantı sayısından tahmin eder. Sistem, o anda en az sayıda bağlantıya sahip sunucuya yeni bağlantılar tahsis eder. Veritabanı bağlantıları gibi uzun ömürlü bağlantılara sahip hizmetler için kullanılır.",
@ -1070,7 +1070,6 @@
"For GRE networks, valid segmentation IDs are 1 to 4294967295": "GRE ağları için geçerli segmentasyon kimlikleri 1 ile 4294967295 arasındadır.",
"For VLAN networks, valid segmentation IDs are 1 to 4094": "VLAN ağları için geçerli segmentasyon kimlikleri 1 ile 4094 arasındadır.",
"For VXLAN networks, valid segmentation IDs are 1 to 16777215": "VXLAN ağları için geçerli segmentasyon kimlikleri 1 ile 16777215 arasındadır.",
"For example: username@Default": "Örneğin: username@Default",
"Forbidden": "Yasaklanmış",
"Forbidden Domain": "Yasaklanmış Etki Alanı",
"Forbidden Project": "Yasaklanmış Proje",
@ -1883,7 +1882,7 @@
"Please enter the server id to be reduced, and separate different id with \",\"": "Azaltılacak sunucu ID'sini girin ve farklı ID'leri \",\" ile ayırın",
"Please fill in the peer network segment and subnet mask of CIDR format, the written subnets should be under the same router, one per line.": "CIDR biçimindeki eş ağ segmenti ve alt ağ maskesini doldurun, yazılı alt ağlar aynı yönlendirici altında satır başına bir adet olmalıdır.",
"Please input": "Lütfen girin",
"Please input <username>@<domain name>!": "Lütfen <kullanıcı adı>@<alan adı> girin!",
"Please input <username> or <username>@<domain name>!": "Lütfen <kullanıcı adı> veya <kullanıcı adı>@<etki alanı adı> girin!",
"Please input ICMP code(0-255)": "Lütfen ICMP kodu girin (0-255)",
"Please input ICMP type(0-255)": "Lütfen ICMP türü girin (0-255)",
"Please input IPv4 or IPv6 cidr": "Lütfen IPv4 veya IPv6 cidr girin",
@ -1916,7 +1915,7 @@
"Please input protocol number if it absent in select list.": "Eğer seçim listesinde yoksa, lütfen protokol numarasını girin.",
"Please input provider": "Lütfen sağlayıcı girin",
"Please input snapshot name": "Lütfen anlık görüntü adı girin",
"Please input the correct format: <username>@<domain name>.": "Lütfen doğru biçimi girin: <kullanıcı adı>@<etki alanı adı>.",
"Please input the correct format: <username> or <username>@<domain name>.": "Lütfen doğru biçimi girin: <kullanıcı adı> veya <kullanıcı adı>@<etki alanı adı>.",
"Please input transfer id": "Lütfen transfer ID girin",
"Please input user name": "Lütfen kullanıcı adı girin",
"Please input value": "Lütfen değer girin",
@ -2650,6 +2649,7 @@
"Time between running the check in seconds": "Saniye cinsinden kontrol çalıştırma aralığı",
"Timeout(Minute)": "Zaman Aşımı(Dakika)",
"Timeout(s)": "Zaman Aşımı(Saniye)",
"Tips: without domain means \"Default\" domain.": "İpuçları: Alan adı olmadan \"Default\" alan adı anlamına gelir.",
"To open": "Açmak için",
"Today CPU usage > 80% alert": "Bugünkü CPU kullanımı > 80% uyarısı",
"Today Memory usage > 80% alert": "Bugünkü bellek kullanımı > 80% uyarısı",

8
src/locales/zh-hans.json
View File

@ -29,7 +29,7 @@
"5min": "5分钟",
"8 to 16 characters, at least one uppercase letter, one lowercase letter, one number.": "8个到16个字符，至少一个大写字母，一个小写字母，一个数字。",
"8 to 32 characters, at least one uppercase letter, one lowercase letter, one number and one special character.": "8个到32个字符，至少一个大写字母，一个小写字母，一个数字和一个特殊字符。",
"<username>@<domain name>": "<用户名>@<用户域名>",
"<username> or <username>@<domain>": "<用户名> 或 <用户名>@<用户域名>",
"A command that will be sent to the container": "将发送到容器的命令",
"A container with the same name already exists": "已存在同名容器",
"A dynamic scheduling algorithm that estimates the server load based on the number of currently active connections. The system allocates new connection requests to the server with the least number of current connections. Commonly used for long connection services, such as database connections and other services.": "通过当前活跃的连接数来估计服务器负载情况的一种动态调度算法，系统把新的连接请求分配给当前连接数目最少的服务器。常用于长连接服务，例如数据库连接等服务。",
@ -1070,7 +1070,6 @@
"For GRE networks, valid segmentation IDs are 1 to 4294967295": "对于GRE网络，有效的段ID范围是从1到4294967295",
"For VLAN networks, valid segmentation IDs are 1 to 4094": "对于VLAN网络，有效的段ID范围是从1到4094",
"For VXLAN networks, valid segmentation IDs are 1 to 16777215": "对于VXLAN网络，有效的段ID范围是从1到16777215",
"For example: username@Default": "例如：username@Default",
"Forbidden": "禁用",
"Forbidden Domain": "禁用域",
"Forbidden Project": "禁用项目",
@ -1883,7 +1882,7 @@
"Please enter the server id to be reduced, and separate different id with \",\"": "请输入指定缩减的server ID，并且不同ID之间用 ',' 分隔",
"Please fill in the peer network segment and subnet mask of CIDR format, the written subnets should be under the same router, one per line.": "请填写CIDR格式的对端网段，且填写的网段需在同一个路由下，每行一个。",
"Please input": "请输入",
"Please input <username>@<domain name>!": "请输入<用户名>@<用户域名>！",
"Please input <username> or <username>@<domain name>!": "请输入<用户名> 或 <用户名>@<用户域名>！",
"Please input ICMP code(0-255)": "请输入ICMP编码(0-255)",
"Please input ICMP type(0-255)": "请输入ICMP类型(0-255)",
"Please input IPv4 or IPv6 cidr": "请输入IPv4或IPv6网段地址",
@ -1916,7 +1915,7 @@
"Please input protocol number if it absent in select list.": "如果选择列表中没有，请输入协议号。",
"Please input provider": "请输入提供者",
"Please input snapshot name": "请输入快照名称",
"Please input the correct format: <username>@<domain name>.": "请输入正确格式：<用户名>@<用户域名>",
"Please input the correct format: <username> or <username>@<domain name>.": "请输入正确格式：<用户名> 或 <用户名>@<用户域名>",
"Please input transfer id": "请输入转让Id",
"Please input user name": "请输入用户名称",
"Please input value": "请输入值",
@ -2650,6 +2649,7 @@
"Time between running the check in seconds": "运行检查之间的时间（以秒为单位）",
"Timeout(Minute)": "创建超时（分钟）",
"Timeout(s)": "检查超时时间(秒)",
"Tips: without domain means \"Default\" domain.": "提示：不输入域名则默认为“Default”域名。",
"To open": "去开通",
"Today CPU usage > 80% alert": "今日CPU使用率大于80%的告警",
"Today Memory usage > 80% alert": "今日内存使用率大于80%的告警",

12
src/pages/auth/containers/Login/index.jsx
View File

@ -188,8 +188,10 @@ export class Login extends Component {
const domainItem = {
name: 'domain',
required: true,
render: () => <Input placeholder={t('<username>@<domain name>')} />,
extra: t('For example: username@Default'),
render: () => (
<Input placeholder={t('<username> or <username>@<domain>')} />
),
extra: t('Tips: without domain means "Default" domain.'),
rules: [{ required: true, validator: this.usernameDomainValidator }],
};
const usernameItem = {
@ -361,11 +363,13 @@ export class Login extends Component {
usernameDomainValidator = (rule, value) => {
if (!value || !value.trim()) {
return Promise.reject(t('Please input <username>@<domain name>!'));
return Promise.reject(
t('Please input <username> or <username>@<domain name>!')
);
}
const tmp = value.trim().split('@');
const message = t(
'Please input the correct format: <username>@<domain name>.'
'Please input the correct format: <username> or <username>@<domain name>.'
);
if (tmp.length > 2) {
return Promise.reject(new Error(message));