Merge pull request #26 from tamplan/fix_tipography_mistakes

added fluxbb: package prefix for language strings
fluxbb · Jun 14, 2014 · b1b8ffa · b1b8ffa
2 parents b8f7797 + 306392e
commit b1b8ffa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/FluxBB/Actions/Login.php b/src/FluxBB/Actions/Login.php
@@ -49,7 +49,7 @@ protected function makeResponse()
     {
         if ($this->succeeded()) {
             return \Redirect::route('index')
-                ->withMessage(trans('fluxbb::register.reg_complete'));
+                ->withMessage(trans('fluxbb::login.message_login'));
         } else {
             // TODO: Error handling here!
             return \Response::make();

diff --git a/src/helpers/filters.php b/src/helpers/filters.php
@@ -16,7 +16,7 @@
 Route::filter('only_members', function () {
     if (!Auth::check()) {
         return Redirect::to_action('auth@login')
-            ->with('message', trans('common.login_to_view'))
+            ->with('message', trans('fluxbb::common.login_to_view'))
             ->with('login_redirect', URL::current()); // TODO: URL::current() is not yet implemented
     }
 });
diff --git a/src/helpers/html.php b/src/helpers/html.php
@@ -24,7 +24,7 @@
 
 HTML::macro('format_time', function ($timestamp, $date_only = false, $date_format = null, $time_format = null, $time_only = false, $no_text = false) {
     if ($timestamp == '') {
-        return trans('common.never');
+        return trans('fluxbb::common.never');
     }
 
     $diff = (0 + 0) * 3600; // FIXME: $pun_user['timezone'] + $pun_user['dst'];
@@ -45,9 +45,9 @@
 
     if (!$no_text) {
         if ($date == $today) {
-            $date = trans('common.today');
+            $date = trans('fluxbb::common.today');
         } elseif ($date == $yesterday) {
-            $date = trans('common.yesterday');
+            $date = trans('fluxbb::common.yesterday');
         }
     }
 
@@ -64,5 +64,5 @@
 // A wrapper for PHP's number_format function
 //
 HTML::macro('number_format', function ($number, $decimals = 0) {
-    return is_numeric($number) ? number_format($number, $decimals, trans('common.lang_decimal_point'), trans('common.lang_thousands_sep')) : $number;
+    return is_numeric($number) ? number_format($number, $decimals, trans('fluxbb::common.lang_decimal_point'), trans('fluxbb::common.lang_thousands_sep')) : $number;
 });
diff --git a/src/lang/en/login.php b/src/lang/en/login.php
@@ -21,6 +21,10 @@
 
 // Forget password mail stuff
 'forget_mail'				=>	'An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at',
-'email_flood'				=>	'This account has already requested a password reset in the past hour. Please wait a while before requesting a new password again.'
+'email_flood'				=>	'This account has already requested a password reset in the past hour. Please wait a while before requesting a new password again.',
+
+// Messages
+'message_login'			=>	'Logged in successfully and redirecting …',
+'message_logout'    =>  'You are not logged in.',
 
 );
diff --git a/src/views/auth/login.blade.php b/src/views/auth/login.blade.php
@@ -13,7 +13,7 @@
             <label><input type="checkbox" name="save_pass" value="1" tabindex="3" />{{ trans('fluxbb::login.remember_me') }}<br /></label>
         </div>
 
-        <p class="clearb">{{ trans('fluxbb::login.info') }}</p>
+        <p class="clearb">{{ trans('fluxbb::login.login_info') }}</p>
         <p class="actions"><span><a href="{{ route('register') }}" tabindex="5">{{ trans('fluxbb::login.not_registered') }}</a></span> <span><a href="{{ route('forgot_password') }}" tabindex="6">{{ trans('fluxbb::login.forgotten_pass') }}</a></span></p>
     </fieldset>
     <p class="buttons"><input type="submit" name="login" value="{{ trans('fluxbb::common.login') }}" tabindex="4" /></p>