From 57eb69927c3f990326e13888e40f0feb740a4e19 Mon Sep 17 00:00:00 2001 From: S4KH Date: Tue, 25 Oct 2016 11:22:55 +0800 Subject: Changed constants name MIN_TEAM_LENGTH value to 2 and the error message (#4149) --- webapp/components/create_team/components/display_name.jsx | 2 +- webapp/components/create_team/components/team_url.jsx | 3 +++ webapp/i18n/en.json | 4 ++-- webapp/i18n/es.json | 4 ++-- webapp/i18n/fr.json | 4 ++-- webapp/i18n/ja.json | 4 ++-- webapp/i18n/ko.json | 4 ++-- webapp/i18n/nl.json | 2 +- webapp/i18n/pt-BR.json | 4 ++-- webapp/i18n/zh_CN.json | 4 ++-- webapp/i18n/zh_TW.json | 4 ++-- webapp/utils/constants.jsx | 2 +- 12 files changed, 22 insertions(+), 19 deletions(-) (limited to 'webapp') diff --git a/webapp/components/create_team/components/display_name.jsx b/webapp/components/create_team/components/display_name.jsx index f880d2554..50e7b340b 100644 --- a/webapp/components/create_team/components/display_name.jsx +++ b/webapp/components/create_team/components/display_name.jsx @@ -30,7 +30,7 @@ export default class TeamSignupDisplayNamePage extends React.Component { this.setState({nameError: Utils.localizeMessage('create_team.display_name.required', 'This field is required')}); return; } else if (displayName.length < Constants.MIN_TEAMNAME_LENGTH || displayName.length > Constants.MAX_TEAMNAME_LENGTH) { - this.setState({nameError: Utils.localizeMessage('create_team.display_name.charLength', 'Name must be 4 or more characters up to a maximum of 15')}); + this.setState({nameError: Utils.localizeMessage('create_team.display_name.charLength', 'Name must be 2 or more characters up to a maximum of 15')}); return; } diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx index b943f983c..222755197 100644 --- a/webapp/components/create_team/components/team_url.jsx +++ b/webapp/components/create_team/components/team_url.jsx @@ -52,6 +52,9 @@ export default class TeamUrl extends React.Component { if (cleanedName !== name || !urlRegex.test(name)) { this.setState({nameError: Utils.localizeMessage('create_team.team_url.regex', "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.")}); return; + } else if (cleanedName.length < Constants.MIN_TEAMNAME_LENGTH || cleanedName.length > Constants.MAX_TEAMNAME_LENGTH) { + this.setState({nameError: Utils.localizeMessage('create_team.team_url.charLength', 'Name must be 2 or more characters up to a maximum of 15')}); + return; } for (let index = 0; index < Constants.RESERVED_TEAM_NAMES.length; index++) { diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 4e83c3264..9b78b2803 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1108,13 +1108,13 @@ "create_post.write": "Write a message...", "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {siteName}.", "create_team.display_name.back": "Back to previous step", - "create_team.display_name.charLength": "Name must be 4 or more characters up to a maximum of 15", + "create_team.display_name.charLength": "Name must be 2 or more characters up to a maximum of 15", "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.", "create_team.display_name.next": "Next", "create_team.display_name.required": "This field is required", "create_team.display_name.teamName": "Team Name", "create_team.team_url.back": "Back to previous step", - "create_team.team_url.charLength": "Name must be 4 or more characters up to a maximum of 15", + "create_team.team_url.charLength": "Name must be 2 or more characters up to a maximum of 15", "create_team.team_url.creatingTeam": "Creating team...", "create_team.team_url.finish": "Finish", "create_team.team_url.hint": "
  • Short and memorable is best
  • Use lowercase letters, numbers and dashes
  • Must start with a letter and can't end in a dash
    • ", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 09343bc0a..927ca982c 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -1102,13 +1102,13 @@ "create_post.write": "Escribe un mensaje...", "create_team.agreement": "Al proceder con la creación de tu cuenta y utilizar {siteName}, estás de acuerdo con nuestros Términos de Servicio y Políticas de Privacidad. Si no estás de acuerdo, no puedes utilizar {siteName}.", "create_team.display_name.back": "Volver al paso anterior", - "create_team.display_name.charLength": "El Nombre debe tener entre 4 y 15 caracteres", + "create_team.display_name.charLength": "El Nombre debe tener entre 2 y 15 caracteres", "create_team.display_name.nameHelp": "Nombre de tu equipo en cualquier idioma. El nombre del equipo se muestra en menús y encabezados.", "create_team.display_name.next": "Siguiente", "create_team.display_name.required": "Este campo es requerido", "create_team.display_name.teamName": "Nombre del Equipo", "create_team.team_url.back": "Volver al paso anterior", - "create_team.team_url.charLength": "El nombre debe tener entre 4 y 15 caracteres", + "create_team.team_url.charLength": "El nombre debe tener entre 2 y 15 caracteres", "create_team.team_url.creatingTeam": "Creando equipo...", "create_team.team_url.finish": "Finalizar", "create_team.team_url.hint": "
  • Corto y memorable es mejor
  • Utiliza letras en minúscula, números y guiones
  • Debe comenzar con una letra y no puede terminar en guión
    • ", diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json index 6695a9e4d..b5103ab1e 100644 --- a/webapp/i18n/fr.json +++ b/webapp/i18n/fr.json @@ -1102,13 +1102,13 @@ "create_post.write": "Écrire un message...", "create_team.agreement": "En créant votre compte et en utilisant votre {siteName}, vous acceptez nos Terms of Service and Privacy Policy. Si vous n’acceptez pas, vous ne pouvez utilisé votre {siteName}.", "create_team.display_name.back": "Retour à l’étape précedente", - "create_team.display_name.charLength": "Le nom doit contenir de 4 à 15 caractères", + "create_team.display_name.charLength": "Le nom doit contenir de 2 à 15 caractères", "create_team.display_name.nameHelp": "Nommez votre équipe dans toutes les langues. Votre nom d'équipe sera montré dans les menus et rubriques.", "create_team.display_name.next": "Suivant", "create_team.display_name.required": "Ce champ est obligatoire", "create_team.display_name.teamName": "Nom de l'équipe", "create_team.team_url.back": "Retour à l’étape précedente", - "create_team.team_url.charLength": "Le nom doit contenir de 4 à 15 caractères", + "create_team.team_url.charLength": "Le nom doit contenir de 2 à 15 caractères", "create_team.team_url.creatingTeam": "Création de l'équipe...", "create_team.team_url.finish": "Terminer", "create_team.team_url.hint": "
  • Courte et facile à retenir
  • Utilisez des lettres minuscules, des chiffres et des tirets
  • Doit commencer par une lettre et ne peut pas se terminer par un tiret
    • ", diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json index eb7c2a375..8b0167e4a 100644 --- a/webapp/i18n/ja.json +++ b/webapp/i18n/ja.json @@ -1102,13 +1102,13 @@ "create_post.write": "メッセージを書き込んでいます…", "create_team.agreement": "アカウントを作成し{siteName}を利用する前に使用条件とプライバシーポリシーに同意してください。同意できない場合は{siteName}は使用できません。", "create_team.display_name.back": "前のステップに戻る", - "create_team.display_name.charLength": "名前は4文字以上の15文字以下にしてください", + "create_team.display_name.charLength": "名前は2文字以上の15文字以下にしてください", "create_team.display_name.nameHelp": "チーム名はどんな言語でも使うことができます。チーム名はメニューと画面上部に表示されます。", "create_team.display_name.next": "次へ", "create_team.display_name.required": "この項目は必須です", "create_team.display_name.teamName": "チーム名", "create_team.team_url.back": "前のステップに戻る", - "create_team.team_url.charLength": "名前は4文字以上の15文字以下にしてください", + "create_team.team_url.charLength": "名前は2文字以上の15文字以下にしてください", "create_team.team_url.creatingTeam": "チームを作成中です…", "create_team.team_url.finish": "完了", "create_team.team_url.hint": "
  • 短く覚えやすいものがベストです
  • 英小文字、数字、ダッシュを使ってください
  • 英小文字で始めてください。ダッシュで終わることはできません
    • ", diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json index cd24e0d9f..76e5f111a 100644 --- a/webapp/i18n/ko.json +++ b/webapp/i18n/ko.json @@ -1102,13 +1102,13 @@ "create_post.write": "메시지를 입력하세요...", "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {siteName}.", "create_team.display_name.back": "이전 단계로 돌아가기", - "create_team.display_name.charLength": "Name must be 4 or more characters up to a maximum of 15", + "create_team.display_name.charLength": "Name must be 2 or more characters up to a maximum of 15", "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.", "create_team.display_name.next": "다음", "create_team.display_name.required": "필수 항목입니다.", "create_team.display_name.teamName": "팀 이름", "create_team.team_url.back": "이전 단계로 돌아가기", - "create_team.team_url.charLength": "Name must be 4 or more characters up to a maximum of 15", + "create_team.team_url.charLength": "Name must be 2 or more characters up to a maximum of 15", "create_team.team_url.creatingTeam": "팀 생성 중...", "create_team.team_url.finish": "완료", "create_team.team_url.hint": "
  • Short and memorable is best
  • Use lowercase letters, numbers and dashes
  • Must start with a letter and can't end in a dash
    • ", diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json index e5adcdb5a..7f95c2fdf 100644 --- a/webapp/i18n/nl.json +++ b/webapp/i18n/nl.json @@ -1108,7 +1108,7 @@ "create_team.display_name.required": "Dit is een verplicht veld", "create_team.display_name.teamName": "Team naam", "create_team.team_url.back": "Terug naar de vorige stap", - "create_team.team_url.charLength": "De naam moet langer zijn dan 4 tekens met een maximum van 15", + "create_team.team_url.charLength": "De naam moet langer zijn dan 2 tekens met een maximum van 15", "create_team.team_url.creatingTeam": "Maken van team...", "create_team.team_url.finish": "Voltooien", "create_team.team_url.hint": "
  • Kort en gemakkelijk te onthouden is het beste
  • Gebruik kleine letter, nummers en streepjes
  • Een teamnaam moet met een letter beginnen en mag niet met een streepje eindigen
    • ", diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json index 99f5180ae..dc26d3ea5 100644 --- a/webapp/i18n/pt-BR.json +++ b/webapp/i18n/pt-BR.json @@ -1102,13 +1102,13 @@ "create_post.write": "Escreva uma mensagem...", "create_team.agreement": "Ao prosseguir para criar sua conta e usar {siteName}, você concorda com nosso Termo de Serviço e Politica de Privacidade. Se você não concorda, você não pode usar {siteName}.", "create_team.display_name.back": "Voltar para o passo anterior", - "create_team.display_name.charLength": "O nome deve ser de 4 ou mais caracteres até um máximo de 15", + "create_team.display_name.charLength": "O nome deve ser de 2 ou mais caracteres até um máximo de 15", "create_team.display_name.nameHelp": "Nome da sua equipe em qualquer idioma. Seu nome de equipe é mostrado em menus e títulos.", "create_team.display_name.next": "Próximo", "create_team.display_name.required": "Este campo é obrigatório", "create_team.display_name.teamName": "Nome da Equipe", "create_team.team_url.back": "Voltar para o passo anterior", - "create_team.team_url.charLength": "O nome deve ser de 4 ou mais caracteres até um máximo de 15", + "create_team.team_url.charLength": "O nome deve ser de 2 ou mais caracteres até um máximo de 15", "create_team.team_url.creatingTeam": "Criando equipe...", "create_team.team_url.finish": "Terminar", "create_team.team_url.hint": "
  • Curto e memorizável é o melhor
  • Use letras minúsculas, números e traços
  • Deve começar com uma letra e não pode terminar em um traço
    • ", diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json index daac266e4..265935c8f 100644 --- a/webapp/i18n/zh_CN.json +++ b/webapp/i18n/zh_CN.json @@ -1102,13 +1102,13 @@ "create_post.write": "写一个消息...", "create_team.agreement": "如果继续创建您的帐户和使用{siteName}，您需要同意服务条款和隐私政策。如果不同意，您将不能使用{siteName}。", "create_team.display_name.back": "返回上一步", - "create_team.display_name.charLength": "名称必须是4到15个字符", + "create_team.display_name.charLength": "名称必须是2到15个字符", "create_team.display_name.nameHelp": "您可以使用任何语言命名您的团队。您的团队名称将显示在菜单和标题栏上。", "create_team.display_name.next": "下一步", "create_team.display_name.required": "此栏必须填写", "create_team.display_name.teamName": "团队名称", "create_team.team_url.back": "返回上一步", - "create_team.team_url.charLength": "名称必须是4到15个字符", + "create_team.team_url.charLength": "名称必须是2到15个字符", "create_team.team_url.creatingTeam": "创建团队...", "create_team.team_url.finish": "完成", "create_team.team_url.hint": "
  • 简短和易记为最好的
  • 使用小写字母，数字和连字符
  • 必须以字母开头且不能以连字符结尾
    • ", diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json index 577b3e7a0..944e459c6 100644 --- a/webapp/i18n/zh_TW.json +++ b/webapp/i18n/zh_TW.json @@ -1102,13 +1102,13 @@ "create_post.write": "輸入訊息...", "create_team.agreement": "一旦建立帳號使用{siteName}，即表示您同意服務條款以及隱私政策。如果您不同意，請停止使用{siteName}。", "create_team.display_name.back": "回到上一步", - "create_team.display_name.charLength": "名稱長度為4到15字元", + "create_team.display_name.charLength": "名稱長度為2到15字元", "create_team.display_name.nameHelp": "團隊可以用任何語言取名。團隊名稱將會顯示在選單跟畫面上方。", "create_team.display_name.next": "下一步", "create_team.display_name.required": "此欄位是必需的", "create_team.display_name.teamName": "團隊名稱", "create_team.team_url.back": "回到上一步", - "create_team.team_url.charLength": "名稱長度為4到15字元", + "create_team.team_url.charLength": "名稱長度為2到15字元", "create_team.team_url.creatingTeam": "建立團隊中...", "create_team.team_url.finish": "完成", "create_team.team_url.hint": "
  • 短且好記憶是最好的
  • 請用小寫英字母、數字及連接號(-)
  • 請以小寫英字母開頭，請不要以連接號結尾
    • ", diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index 663a8863c..2dae06282 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -808,8 +808,8 @@ export const Constants = { WEBRTC_TIME_DELAY: 750, WEBRTC_CLEAR_ERROR_DELAY: 15000, DEFAULT_MAX_USERS_PER_TEAM: 50, + MIN_TEAMNAME_LENGTH: 2, DEFAULT_MAX_CHANNELS_PER_TEAM: 2000, - MIN_TEAMNAME_LENGTH: 4, MAX_TEAMNAME_LENGTH: 15, MIN_USERNAME_LENGTH: 3, MAX_USERNAME_LENGTH: 22, -- cgit v1.2.3-1-g7c22