From 8b4da06d39c48029ba48ea20cae51ff8d5109927 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 8 Jan 2016 16:15:02 +0100 Subject: [PATCH] register placeholders & textfixes, updated system reference --- lib/system | 2 +- .../page/default_beta/tpl/beta_register.tpl | 14 +++++++------- mojotrollz/sql/mysql/system_text.sql | 18 +++++++++++------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/lib/system b/lib/system index e63f1d9..a7edda5 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit e63f1d9cf86a320d118565819902829e2a66cff0 +Subproject commit a7edda5338c208d4ce2e3295019c793edc711e88 diff --git a/mojotrollz/page/default_beta/tpl/beta_register.tpl b/mojotrollz/page/default_beta/tpl/beta_register.tpl index 140cb3f..07b53d9 100644 --- a/mojotrollz/page/default_beta/tpl/beta_register.tpl +++ b/mojotrollz/page/default_beta/tpl/beta_register.tpl @@ -16,8 +16,8 @@ style="margin-bottom: 15px; float: left;" id="register_username" placeholder="peter" - minlength="3" data-validation-minlength-message="${sai_error_username_short}" - required data-validation-required-message="Username required"/> + minlength="3" data-validation-minlength-message="${basic_username_short}" + required data-validation-required-message="${basic_username_miss}"/>
@@ -31,8 +31,8 @@ style="margin-bottom: 15px; float: left;" id="register_email" placeholder="${basic_placeholder_email}" - data-validation-email-message="${sai_error_email_wrong}" - required data-validation-required-message="EMail required"/> + data-validation-email-message="${basic_email_wrong}" + required data-validation-required-message="${basic_email_miss}"/>
@@ -48,8 +48,8 @@ id="user_register_password1" name="user_register_password1" placeholder="${basic_placeholder_password}" - minlength="5" data-validation-minlength-message="${sai_error_password_short}" - required data-validation-required-message="Password required"/> + minlength="5" data-validation-minlength-message="${basic_password_short}" + required data-validation-required-message="${basic_password_miss}"/>
@@ -60,7 +60,7 @@ name="user_register_password2" placeholder="${basic_placeholder_password}" data-validation-matches-match="user_register_password1" - data-validation-matches-message="Password missmatch"/> + data-validation-matches-message="${basic_password_miss}"/>
diff --git a/mojotrollz/sql/mysql/system_text.sql b/mojotrollz/sql/mysql/system_text.sql index a9b3444..80e4394 100644 --- a/mojotrollz/sql/mysql/system_text.sql +++ b/mojotrollz/sql/mysql/system_text.sql @@ -14,17 +14,21 @@ REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_vote', 'mojotrollz'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_name', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_register', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password', 'mojotrollz'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_login', 'mojotrollz'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_logout', 'mojotrollz'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'mojotrollz'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'mojotrollz'); - -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_error_username_short', 'mojotrollz'); -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_error_username_long', 'mojotrollz'); -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_error_username_miss', 'mojotrollz'); -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_error_password_short', 'mojotrollz'); -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_error_password_long', 'mojotrollz'); -REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_error_password_miss', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_email', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_short', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_long', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_miss', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_short', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_miss', 'mojotrollz'); +REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_match', 'mojotrollz'); REPLACE INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('link_facebook', 'enUS', 'https://www.facebook.com/pages/Mojo-WoW/204351992944865', 10, 10, '2015-09-17 23:16:50', '2015-09-17 23:16:50'); REPLACE INTO `system_text_tag` (`id`, `tag`) VALUES ('link_facebook', 'link');