Fix bad placeholders

userfrosting · Jun 26, 2017 · d054306 · d054306
1 parent 9815a44
commit d054306
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/app/sprinkles/account/locale/en_US/messages.php b/app/sprinkles/account/locale/en_US/messages.php
@@ -67,19 +67,16 @@
     "HEADER_MESSAGE_ROOT" => "YOU ARE SIGNED IN AS THE ROOT USER",
 
     "LAST_NAME" => "Last name",
-
     "LOCALE" => [
         "ACCOUNT" => "The language and locale to use for your account",
         "INVALID" => "<strong>{{locale}}</strong> is not a valid locale."
     ],
-
     "LOGIN" => [
         "@TRANSLATION"      => "Login",
         "ALREADY_COMPLETE"  => "You are already logged in!",
         "SOCIAL"            => "Or login with",
         "REQUIRED"          => "Sorry, you must be logged in to access this resource."
     ],
-
     "LOGOUT" => "Logout",
 
     "NAME" => "Name",
@@ -104,6 +101,11 @@
         "CONFIRM_NEW"           => "Confirm New Password",
         "CONFIRM_NEW_EXPLAIN"   => "Re-enter your new password",
         "CONFIRM_NEW_HELP"      => "Required only if selecting a new password",
+        "CREATE" => [
+            "@TRANSLATION"  => "Create Password",
+            "PAGE"          => "Choose a password for your new account.",
+            "SET"           => "Set Password and Sign In"
+        ],
         "CURRENT"               => "Current Password",
         "CURRENT_EXPLAIN"       => "You must confirm your current password to make changes",
 
@@ -120,35 +122,29 @@
             "REQUEST_SENT"      => "A password reset link has been sent to <strong>{{email}}</strong>."
         ],
 
+        "HASH_FAILED"       => "Password hashing failed. Please contact a site administrator.",
+        "INVALID"           => "Current password doesn't match the one we have on record",
+        "NEW"               => "New Password",
+        "NOTHING_TO_UPDATE" => "You cannot update with the same password",
+
         "RESET" => [
             "@TRANSLATION"      => "Reset Password",
             "CHOOSE"            => "Please choose a new password to continue.",
             "PAGE"              => "Choose a new password for your account.",
             "SEND"              => "Set New Password and Sign In"
         ],
 
-        "HASH_FAILED"       => "Password hashing failed. Please contact a site administrator.",
-        "INVALID"           => "Current password doesn't match the one we have on record",
-        "NEW"               => "New Password",
-        "NOTHING_TO_UPDATE" => "You cannot update with the same password",
-        "UPDATED"           => "Account password updated",
-
-        "CREATE" => [
-            "@TRANSLATION"  => "Create Password",
-            "PAGE"          => "Choose a password for your new account.",
-            "SET"           => "Set Password and Sign In"
-        ]
+        "UPDATED"           => "Account password updated"
     ],
 
     "PROFILE"       => [
         "SETTINGS"  => "Profile settings",
         "UPDATED"   => "Profile settings updated"
     ],
 
+    "RATE_LIMIT_EXCEEDED"       => "The rate limit for this action has been exceeded.  You must wait another {{delay}} seconds before you will be allowed to make another attempt.",
     "REGISTER"      => "Register",
     "REGISTER_ME"   => "Sign me up",
-    "SIGN_IN_HERE"  => "Already have an account? <a href=\"{{url}}\">Sign in here.</a>",
-
     "REGISTRATION" => [
         "BROKEN"            => "We're sorry, there is a problem with our account registration process.  Please contact us directly for assistance.",
         "COMPLETE_TYPE1"    => "You have successfully registered. You can now sign in.",
@@ -157,11 +153,10 @@
         "LOGOUT"            => "I'm sorry, you cannot register for an account while logged in. Please log out first.",
         "WELCOME"           => "Registration is fast and simple."
     ],
-
-    "RATE_LIMIT_EXCEEDED"       => "The rate limit for this action has been exceeded.  You must wait another {{delay}} seconds before you will be allowed to make another attempt.",
     "REMEMBER_ME"               => "Remember me!",
     "REMEMBER_ME_ON_COMPUTER"   => "Remember me on this computer (not recommended for public computers)",
 
+    "SIGN_IN_HERE"          => "Already have an account? <a href=\"{{url}}\">Sign in here.</a>",
     "SIGNIN"                => "Sign in",
     "SIGNIN_OR_REGISTER"    => "Sign in or register",
     "SIGNUP"                => "Sign Up",

diff --git a/app/sprinkles/account/templates/pages/error/compromised.html.twig b/app/sprinkles/account/templates/pages/error/compromised.html.twig
@@ -4,4 +4,8 @@
 
 {% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
 
-{% block heading %}<i class="fa fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {'url' : '#{site.uri.public}/account/sign-in'}) | raw }}{% endblock %}
+{% block heading %}
+    <i class="fa fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
+        'url' : site.uri.public ~ '/account/sign-in'
+    }) | raw }}
+{% endblock %}
diff --git a/app/sprinkles/account/templates/pages/register.html.twig b/app/sprinkles/account/templates/pages/register.html.twig
@@ -42,7 +42,7 @@
             </div>
             <div class="form-group">
                 <label for="r-form-username">{{translate('USERNAME')}}</label>
-                <span class="pull-right"><a href="#" id="form-register-username-suggest">[{{translate("SUGGEST")}}]</a></span>
+                <span class="pull-right"><a href="#" id="form-register-username-suggest">[{{translate('SUGGEST')}}]</a></span>
                 <input type="text" name="user_name" placeholder="{{translate('USERNAME.CHOOSE')}}" class="form-control" id="r-form-username" autocomplete="off">
             </div>
             <div class="form-group">
@@ -82,7 +82,9 @@
                 <button type="submit" class="btn btn-block btn-primary">{{translate('REGISTER_ME')}}</button>
             </div>
             <div style="padding-top: 10px;">
-                {{translate('SIGN_IN_HERE', {'url' : '#{site.uri.public}/account/sign-in'}) | raw}}
+                {{translate('SIGN_IN_HERE', {
+                    'url' : site.uri.public ~'/account/sign-in'
+                }) | raw}}
             </div>
         </form>
     </div>

diff --git a/app/sprinkles/admin/templates/pages/permission.html.twig b/app/sprinkles/admin/templates/pages/permission.html.twig
@@ -15,7 +15,7 @@
         <div class="col-lg-4">
             <div id="view-permission" class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{translate('PERMISSION.SUMMARY')}}</h3>
+                    <h3 class="box-title">{{translate("PERMISSION.SUMMARY")}}</h3>
                 </div>
                 <div class="box-body box-profile">
                     <div class="text-center">
@@ -34,7 +34,7 @@
                         <i class="fa fa-copy text-blue js-copy-trigger"></i>
                     </span>
                     <hr>
-                    <strong>{{translate('SLUG_CONDITION')}}</strong>
+                    <strong>{{translate("SLUG_CONDITION")}}</strong>
                     <br>
                     <br>
                     <p>
@@ -45,14 +45,14 @@
                     </p>
                 </div>
                 <div class="box-footer">
-                    {{translate('PERMISSION.NOTE_READ_ONLY')}}
+                    {{translate("PERMISSION.NOTE_READ_ONLY")}}
                 </div>
             </div>
         </div>
         <div class="col-lg-8">
             <div id="widget-permission-users" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{translate('USER.WITH_PERMISSION')}}</h3>
+                    <h3 class="box-title"><i class="fa fa-fw fa-key"></i> {{translate("USER.WITH_PERMISSION")}}</h3>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">