From 2b15ecb5fec0e9ac7ec40a8310d8ad544c86e3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= <naruto0426@rulingcom.com>
Date: Wed, 11 Oct 2023 08:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E9=AB=94=E9=A9=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/admin/seminars_field_helper.rb            | 6 ++----
 app/views/seminars/edit_login_seminar_signup.html.erb | 6 +++---
 app/views/seminars/show.html.erb                      | 6 +++---
 config/locales/en.yml                                 | 2 +-
 config/locales/zh_tw.yml                              | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/helpers/admin/seminars_field_helper.rb b/app/helpers/admin/seminars_field_helper.rb
index f6e53b8..b520100 100644
--- a/app/helpers/admin/seminars_field_helper.rb
+++ b/app/helpers/admin/seminars_field_helper.rb
@@ -169,9 +169,7 @@ module Admin::SeminarsFieldHelper
       key = can_muti_lang_input_for_sm? ? "#{key}" : I18n.locale
       place_holder= typeD["placeholder"][key] rescue ''
       name1 = can_muti_lang_input_for_sm? ? (get_field_name_base + "[#{key}]") : get_field_name_base
-      text_area_tag(name1, value, @markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control', :maxlength=> 300)) + (content_tag :p do
-        "(#{I18n.t("seminar.text_area_hint")})"
-      end)
+      text_area_tag(name1, value, @markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control', :maxlength=> 300))
     end
   end
 
@@ -210,7 +208,7 @@ module Admin::SeminarsFieldHelper
   def render_phone
     a = control_group_wrapper_for_sm do |key,value|
       place_holder= typeA["placeholder"][I18n.locale] rescue ''
-      text_field_tag(get_field_name_base, value, @markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control', pattern: "[\\d\\+\\-\\(\\)]+", title: I18n.t("seminar.phone_hint"))) + (content_tag :p do
+      text_field_tag(get_field_name_base, value, @markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control', pattern: "[\\d\\+\\-\\(\\)]{10,13}", title: I18n.t("seminar.phone_hint"))) + (content_tag :p do
         "(#{I18n.t("seminar.phone_hint")})"
       end)
     end
diff --git a/app/views/seminars/edit_login_seminar_signup.html.erb b/app/views/seminars/edit_login_seminar_signup.html.erb
index b66faf9..2e95b22 100644
--- a/app/views/seminars/edit_login_seminar_signup.html.erb
+++ b/app/views/seminars/edit_login_seminar_signup.html.erb
@@ -157,7 +157,7 @@
                 </div>
               <% elsif signup_field.field_name == 'tel' %>
                 <div class="col-sm-10">
-                  <%= f.text_field :tel, :class=>"input-medium form-control", :placeholder=> signup_field.placeholder[I18n.locale], :required => true, pattern: "[\\d\\+\\-\\(\\)]+", title: t("seminar.phone_hint") %>
+                  <%= f.text_field :tel, :class=>"input-medium form-control", :placeholder=> signup_field.placeholder[I18n.locale], :required => true, pattern: "[\\d\\+\\-\\(\\)]{10,13}", title: t("seminar.phone_hint") %>
                   <p>(<%= t("seminar.phone_hint") %>)</p>
                 </div>
               <% else %>
@@ -304,7 +304,7 @@
 
 <script type="text/javascript">
 (function(){
-  function check_repeat_value() {
+  function check_repeat_value(event) {
     var validated = true;
     var all_values = $.map($('input[name^="seminar_signup_values"]:visible'), function(v) {
       return [[v, $(v).val()]];
@@ -332,7 +332,7 @@
       pwd = $('#seminar_signup_password')
 
   $("form.content").submit(function(event) {
-    if (!check_repeat_value()){
+    if (!check_repeat_value(event)){
       return false;
     }
     if ($('*[name^="seminar_signup_values"]:visible')){
diff --git a/app/views/seminars/show.html.erb b/app/views/seminars/show.html.erb
index b66faf9..2e95b22 100644
--- a/app/views/seminars/show.html.erb
+++ b/app/views/seminars/show.html.erb
@@ -157,7 +157,7 @@
                 </div>
               <% elsif signup_field.field_name == 'tel' %>
                 <div class="col-sm-10">
-                  <%= f.text_field :tel, :class=>"input-medium form-control", :placeholder=> signup_field.placeholder[I18n.locale], :required => true, pattern: "[\\d\\+\\-\\(\\)]+", title: t("seminar.phone_hint") %>
+                  <%= f.text_field :tel, :class=>"input-medium form-control", :placeholder=> signup_field.placeholder[I18n.locale], :required => true, pattern: "[\\d\\+\\-\\(\\)]{10,13}", title: t("seminar.phone_hint") %>
                   <p>(<%= t("seminar.phone_hint") %>)</p>
                 </div>
               <% else %>
@@ -304,7 +304,7 @@
 
 <script type="text/javascript">
 (function(){
-  function check_repeat_value() {
+  function check_repeat_value(event) {
     var validated = true;
     var all_values = $.map($('input[name^="seminar_signup_values"]:visible'), function(v) {
       return [[v, $(v).val()]];
@@ -332,7 +332,7 @@
       pwd = $('#seminar_signup_password')
 
   $("form.content").submit(function(event) {
-    if (!check_repeat_value()){
+    if (!check_repeat_value(event)){
       return false;
     }
     if ($('*[name^="seminar_signup_values"]:visible')){
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f2c3a5..f919cab 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -30,7 +30,7 @@ en:
         presentation_type: Presentation
   seminar:
     repeat_hint: Input text must unique!
-    phone_hint: Can only include number, +, -, and ()!
+    phone_hint: "Can only include number, +, -, and ()!(length: 10~13)"
     email_hint: Email is not complete! 
     text_area_hint: Limit 300 characters
     file_limit_hint: File Size cannot larger than 20MB!
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 0f9ea2e..46edc78 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -30,7 +30,7 @@ zh_tw:
         presentation_type: 發表方式
   seminar:
     repeat_hint: 輸入內容不能重複
-    phone_hint: 僅可輸入數字及+ - ()
+    phone_hint: "僅可輸入數字及+ - ()，長度限制10~13"
     email_hint: Email信箱不完整
     text_area_hint: 字數最多只能300個字
     file_limit_hint: 檔案不能超過20MB!