From 055a5b3798d45c80f932032709d9d768d9205bde Mon Sep 17 00:00:00 2001
From: Remo Laubacher <remo.laubacher@gmail.com>
Date: Thu, 17 Apr 2014 22:13:06 +0200
Subject: [PATCH 1/2] strings moved to "lang"

---
 app/Controllers/BrowseController.php     | 20 ++++++++++----------
 app/Controllers/RemindersController.php  |  2 +-
 app/Controllers/UserTricksController.php |  6 +++---
 app/lang/en/browse.php                   | 18 ++++++++++++++++++
 app/lang/en/home.php                     | 11 +++++++++++
 app/lang/en/password.php                 |  8 ++++++++
 app/lang/en/reminders.php                |  2 ++
 app/lang/en/search.php                   |  7 +++++++
 app/lang/en/tricks.php                   |  5 +++++
 app/lang/en/user.php                     |  7 +++++++
 app/lang/en/user_tricks.php              |  8 ++++++++
 app/views/browse/categories.blade.php    |  2 +-
 app/views/browse/tags.blade.php          |  2 +-
 app/views/home/about.blade.php           |  2 +-
 app/views/home/error.blade.php           |  2 +-
 app/views/home/index.blade.php           |  2 +-
 app/views/home/login.blade.php           |  2 +-
 app/views/home/register.blade.php        |  2 +-
 app/views/password/remind.blade.php      |  2 +-
 app/views/password/reset.blade.php       |  2 +-
 app/views/search/result.blade.php        |  2 +-
 app/views/tricks/edit.blade.php          |  2 +-
 app/views/tricks/new.blade.php           |  2 +-
 app/views/user/favorites.blade.php       |  2 +-
 app/views/user/profile.blade.php         |  2 +-
 app/views/user/settings.blade.php        |  2 +-
 26 files changed, 95 insertions(+), 29 deletions(-)
 create mode 100644 app/lang/en/browse.php
 create mode 100644 app/lang/en/home.php
 create mode 100644 app/lang/en/password.php
 create mode 100644 app/lang/en/search.php
 create mode 100644 app/lang/en/tricks.php
 create mode 100644 app/lang/en/user.php
 create mode 100644 app/lang/en/user_tricks.php

diff --git a/app/Controllers/BrowseController.php b/app/Controllers/BrowseController.php
index dba5ba0..b41a4ac 100644
--- a/app/Controllers/BrowseController.php
+++ b/app/Controllers/BrowseController.php
@@ -71,8 +71,8 @@ public function getBrowseCategory($category)
     {
         list($category, $tricks) = $this->tricks->findByCategory($category);
 
-        $type      = 'Category "'.$category->name.'"';
-        $pageTitle = 'Browsing Category "' . $category->name . '"';
+        $type      = \Lang::get('browse.category', array('category' => $category->name));
+        $pageTitle = \Lang::get('browse.browsing_category', array('category' => $category->name));
 
         $this->view('browse.index', compact('tricks', 'type', 'pageTitle'));
     }
@@ -99,8 +99,8 @@ public function getBrowseTag($tag)
     {
         list($tag, $tricks) = $this->tricks->findByTag($tag);
 
-        $type      = 'Tag "'.$tag->name.'"';
-        $pageTitle = 'Browsing Tag "' . $tag->name . '"';
+        $type      = \Lang::get('browse.tag', array('tag' => $tag->name));
+        $pageTitle = \Lang::get('browse.browsing_tag', array('tag' => $tag->name));
 
         $this->view('browse.index', compact('tricks', 'type', 'pageTitle'));
     }
@@ -114,8 +114,8 @@ public function getBrowseRecent()
     {
         $tricks = $this->tricks->findMostRecent();
 
-        $type      = 'Recent';
-        $pageTitle = 'Browsing Most Recent Laravel Tricks';
+        $type      = \Lang::get('browse.recent');
+        $pageTitle = \Lang::get('browse.browsing_most_recent_tricks');
 
         $this->view('browse.index', compact('tricks', 'type', 'pageTitle'));
     }
@@ -129,8 +129,8 @@ public function getBrowsePopular()
     {
         $tricks = $this->tricks->findMostPopular();
 
-        $type      = 'Popular';
-        $pageTitle = 'Browsing Most Popular Laravel Tricks';
+        $type      = \Lang::get('browse.popular');
+        $pageTitle = \Lang::get('browse.browsing_most_popular_tricks');
 
         $this->view('browse.index', compact('tricks', 'type', 'pageTitle'));
     }
@@ -144,8 +144,8 @@ public function getBrowseComments()
     {
         $tricks = $this->tricks->findMostCommented();
 
-        $type      = 'Most commented';
-        $pageTitle = 'Browsing Most Commented Laravel Tricks';
+        $type      = \Lang::get('browse.most_commented');
+        $pageTitle = \Lang::get('browse.browsing_most_commented_tricks');
 
         $this->view('browse.index', compact('tricks', 'type', 'pageTitle'));
     }
diff --git a/app/Controllers/RemindersController.php b/app/Controllers/RemindersController.php
index 957ae14..b10b1bb 100644
--- a/app/Controllers/RemindersController.php
+++ b/app/Controllers/RemindersController.php
@@ -29,7 +29,7 @@ public function getRemind()
     public function postRemind()
     {
         $result = Password::remind(Input::only('email'), function ($message, $user) {
-            $message->subject('Your Password Reminder for Laravel Tricks');
+            $message->subject(\Lang::get('reminders.your_password_reminder'));
         });
 
         switch ($result) {
diff --git a/app/Controllers/UserTricksController.php b/app/Controllers/UserTricksController.php
index ecd7fad..978066b 100644
--- a/app/Controllers/UserTricksController.php
+++ b/app/Controllers/UserTricksController.php
@@ -132,7 +132,7 @@ public function postEdit($slug)
         $trick = $this->trick->edit($trick, $data);
 
         return $this->redirectRoute('tricks.edit', [ $trick->slug ], [
-            'success' => 'Trick has been updated'
+            'success' => \Lang::get('user_tricks.trick_updated')
         ]);
     }
 
@@ -147,7 +147,7 @@ public function getDelete($slug)
         $trick = $this->trick->findBySlug($slug);
 
         if ($trick->user_id != Auth::user()->id) {
-            return "This trick doesn't belong to you";
+            return \Lang::get('user_tricks.trick_does_not_belong_to_you');
         }
 
         $trick->tags()->detach();
@@ -155,7 +155,7 @@ public function getDelete($slug)
         $trick->delete();
 
         return $this->redirectRoute('user.index', null, [
-            'success' => 'Trick has been deleted'
+            'success' => \Lang::get('user_tricks.trick_deleted')
         ]);
     }
 }
diff --git a/app/lang/en/browse.php b/app/lang/en/browse.php
new file mode 100644
index 0000000..6b8010c
--- /dev/null
+++ b/app/lang/en/browse.php
@@ -0,0 +1,18 @@
+<?php 
+
+return array(
+	'site_title' => ':title | Laravel-Tricks.com',
+	'browsing_most_recent_tricks' => 'Browsing Most Recent Laravel Tricks',
+	'browsing_most_popular_tricks' => 'Browsing Most Popular Laravel Tricks',
+	'browsing_tag' => 'Browsing Tag ":tag"',
+	'tag' => 'Tag ":tag"',
+	'tags' => 'Tags',
+	'category' => 'Category ":category"',
+	'categories' => 'Categories',
+	'recent' => 'Recent',
+	'popular' => 'Popular',
+	'most_commented' => 'Most commented',
+	'browsing_most_commented_tricks' => 'Browsing Most Commented Laravel Tricks',
+	'browsing_category' => 'Browsing Category ":category"',
+    
+);
\ No newline at end of file
diff --git a/app/lang/en/home.php b/app/lang/en/home.php
new file mode 100644
index 0000000..b26ca29
--- /dev/null
+++ b/app/lang/en/home.php
@@ -0,0 +1,11 @@
+<?php 
+
+return array(
+	'about_tricks_website' => 'About Laravel-Tricks website',
+	'error' => 'Error',
+	'welcome' => 'Welcome',
+	'login' => 'Login',
+	'registration' => 'Registration',
+    
+);
+
diff --git a/app/lang/en/password.php b/app/lang/en/password.php
new file mode 100644
index 0000000..2fd27dd
--- /dev/null
+++ b/app/lang/en/password.php
@@ -0,0 +1,8 @@
+<?php 
+
+return array(
+	'reset_password' => 'Reset password',
+	'resetting_password' => 'Resetting password',
+    
+);
+
diff --git a/app/lang/en/reminders.php b/app/lang/en/reminders.php
index b35b56e..71514a1 100644
--- a/app/lang/en/reminders.php
+++ b/app/lang/en/reminders.php
@@ -20,5 +20,7 @@
     "token" => "This password reset token is invalid.",
 
     "sent" => "Password reminder sent!",
+    
+    "your_password_reminder" => "Your Password Reminder for Laravel Tricks",
 
 );
diff --git a/app/lang/en/search.php b/app/lang/en/search.php
new file mode 100644
index 0000000..233f7ed
--- /dev/null
+++ b/app/lang/en/search.php
@@ -0,0 +1,7 @@
+<?php 
+
+return array(
+	'search_results_for' => 'Search results for ":term"',
+    
+);
+
diff --git a/app/lang/en/tricks.php b/app/lang/en/tricks.php
new file mode 100644
index 0000000..3ef8011
--- /dev/null
+++ b/app/lang/en/tricks.php
@@ -0,0 +1,5 @@
+<?php 
+
+return array(
+	'trick' => 'Trick',
+);
\ No newline at end of file
diff --git a/app/lang/en/user.php b/app/lang/en/user.php
new file mode 100644
index 0000000..1596258
--- /dev/null
+++ b/app/lang/en/user.php
@@ -0,0 +1,7 @@
+<?php 
+
+return array(
+	'my_favorites' => 'My Favorites',
+	'profile' => 'Profile',
+	'settings' => 'Settings',
+);
\ No newline at end of file
diff --git a/app/lang/en/user_tricks.php b/app/lang/en/user_tricks.php
new file mode 100644
index 0000000..167aa78
--- /dev/null
+++ b/app/lang/en/user_tricks.php
@@ -0,0 +1,8 @@
+<?php 
+
+return array(
+	'trick_update' => 'Trick has been updated',
+	'trick_deleted' => 'Trick has been deleted',
+	'trick_does_not_belong_to_you' => 'This trick doesn\'t belong to you',
+    
+);
\ No newline at end of file
diff --git a/app/views/browse/categories.blade.php b/app/views/browse/categories.blade.php
index 6c4e0ae..2f0b310 100644
--- a/app/views/browse/categories.blade.php
+++ b/app/views/browse/categories.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Categories')
+@section('title', trans('browse.categories'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/browse/tags.blade.php b/app/views/browse/tags.blade.php
index 5179b2a..f0f7de4 100644
--- a/app/views/browse/tags.blade.php
+++ b/app/views/browse/tags.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Tags')
+@section('title', trans('browse.tags'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/home/about.blade.php b/app/views/home/about.blade.php
index ef5f1bd..f3bc448 100644
--- a/app/views/home/about.blade.php
+++ b/app/views/home/about.blade.php
@@ -1,4 +1,4 @@
-@section('title','About Laravel-Tricks website')
+@section('title', trans('home.about_tricks_website'))
 
 @section('content')
 <div class="container">
diff --git a/app/views/home/error.blade.php b/app/views/home/error.blade.php
index f264660..2d6a66c 100644
--- a/app/views/home/error.blade.php
+++ b/app/views/home/error.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.main')
 
-@section('title','Error')
+@section('title', trans('home.error'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/home/index.blade.php b/app/views/home/index.blade.php
index c7629b5..b8d7e8e 100644
--- a/app/views/home/index.blade.php
+++ b/app/views/home/index.blade.php
@@ -1,4 +1,4 @@
-@section('title','Welcome')
+@section('title', trans('home.welcome'))
 
 @section('content')
 	<div class="container">
diff --git a/app/views/home/login.blade.php b/app/views/home/login.blade.php
index a3943ec..b3fa6f5 100644
--- a/app/views/home/login.blade.php
+++ b/app/views/home/login.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Login')
+@section('title', trans('home.login'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/home/register.blade.php b/app/views/home/register.blade.php
index 685bc6e..4e820b4 100644
--- a/app/views/home/register.blade.php
+++ b/app/views/home/register.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Registration')
+@section('title', trans('home.registration'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/password/remind.blade.php b/app/views/password/remind.blade.php
index edafd4f..26dbf93 100644
--- a/app/views/password/remind.blade.php
+++ b/app/views/password/remind.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Reset password')
+@section('title', trans('password.reset_password'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/password/reset.blade.php b/app/views/password/reset.blade.php
index 63cbb54..88036a0 100644
--- a/app/views/password/reset.blade.php
+++ b/app/views/password/reset.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Resetting password')
+@section('title', trans('password.resetting_password'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/search/result.blade.php b/app/views/search/result.blade.php
index fbd029e..9b0917d 100644
--- a/app/views/search/result.blade.php
+++ b/app/views/search/result.blade.php
@@ -1,4 +1,4 @@
-@section('title','Search results for "'.$term.'"')
+@section('title', trans('search.search_results_for', array('term' => $term)))
 
 @section('scripts')
 <script type="text/javascript">
diff --git a/app/views/tricks/edit.blade.php b/app/views/tricks/edit.blade.php
index 70a1acf..3737e80 100644
--- a/app/views/tricks/edit.blade.php
+++ b/app/views/tricks/edit.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Trick')
+@section('title', trans('tricks.trick'))
 
 @section('styles')
 	<link rel="stylesheet" href="{{ URL::asset('js/selectize/css/selectize.bootstrap3.css') }}">
diff --git a/app/views/tricks/new.blade.php b/app/views/tricks/new.blade.php
index 808c608..1ca7d0c 100644
--- a/app/views/tricks/new.blade.php
+++ b/app/views/tricks/new.blade.php
@@ -1,4 +1,4 @@
-@section('title', 'Trick')
+@section('title', trans('tricks.trick'))
 
 @section('styles')
 	<link rel="stylesheet" href="{{ URL::asset('css/highlight/laratricks.css') }}">
diff --git a/app/views/user/favorites.blade.php b/app/views/user/favorites.blade.php
index c930896..5c5ac7a 100644
--- a/app/views/user/favorites.blade.php
+++ b/app/views/user/favorites.blade.php
@@ -1,4 +1,4 @@
-@section('title','My Favorites')
+@section('title', trans('user.my_favorites'))
 
 @section('content')
     <div class="container">
diff --git a/app/views/user/profile.blade.php b/app/views/user/profile.blade.php
index 7cba688..1d40df5 100644
--- a/app/views/user/profile.blade.php
+++ b/app/views/user/profile.blade.php
@@ -1,4 +1,4 @@
-@section('title','Profile')
+@section('title', trans('user.profile'))
 
 @section('content')
 <div class="container">
diff --git a/app/views/user/settings.blade.php b/app/views/user/settings.blade.php
index 113f95e..8ed6157 100644
--- a/app/views/user/settings.blade.php
+++ b/app/views/user/settings.blade.php
@@ -1,4 +1,4 @@
-@section('title','Settings')
+@section('title', trans('user.settings'))
 
 @section('styles')
 <link rel="stylesheet" href="{{ URL::asset('css/jquery.Jcrop.min.1.css') }}">

From 303fe441be6b99c4f754b0812c2a0d32e83efb45 Mon Sep 17 00:00:00 2001
From: Remo Laubacher <remo.laubacher@gmail.com>
Date: Thu, 17 Apr 2014 23:13:46 +0200
Subject: [PATCH 2/2] admin strings

---
 app/views/admin/categories/edit.blade.php | 12 ++++-----
 app/views/admin/categories/list.blade.php | 32 +++++++++++------------
 app/views/admin/tags/edit.blade.php       | 10 +++----
 app/views/admin/tags/list.blade.php       | 28 ++++++++++----------
 app/views/admin/users/list.blade.php      | 16 ++++++------
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/app/views/admin/categories/edit.blade.php b/app/views/admin/categories/edit.blade.php
index 6ddb8ab..d702ddd 100644
--- a/app/views/admin/categories/edit.blade.php
+++ b/app/views/admin/categories/edit.blade.php
@@ -1,36 +1,36 @@
-@section('title','Editing category')
+@section('title', trans('admin.editing_category'))
 
 @section('content')
 <div class="container">
 	<div class="row">
 		<div class="col-lg-6"> 
 			<div class="page-header">
-			  	<h1>Editing a category <a href="{{ url('admin/categories')}}" class="btn btn-lg btn-default pull-right">Cancel</a></h1>
+			  	<h1>{{ trans('admin.editing_a_category') }} <a href="{{ url('admin/categories')}}" class="btn btn-lg btn-default pull-right">{{ trans('admin.cancel') }}</a></h1>
 			</div>
 
             @if($errors->all())
                 <div class="bs-callout bs-callout-danger">
-                    <h4>Please fix the errors below:</h4>
+                    <h4>{{ trans('admin.please_fix_errors') }}</h4>
                     {{ HTML::ul($errors->all())}}
                 </div>
             @endif
 
 			{{ Form::model($category,array('class'=>'form-horizontal'))}}
         	<div class="form-group">
-        	    <label for="name" class="col-lg-2 control-label">Name</label>
+        	    <label for="name" class="col-lg-2 control-label">{{ trans('admin.name') }}</label>
         	    <div class="col-lg-10">
         	    	{{ Form::text('name',null,array('class'=>'form-control'))}}
         	    </div>
         	</div>
             <div class="form-group">
-                <label for="description" class="col-lg-2 control-label">Description</label>
+                <label for="description" class="col-lg-2 control-label">{{ trans('admin.description') }}</label>
                 <div class="col-lg-10">
                     {{ Form::textarea('description',null,array('class'=>'form-control','rows'=>'5'))}}
                 </div>
             </div>
         	<div class="form-group">
         		<div class="col-lg-10 col-lg-offset-2">
-        		{{ Form::submit('Save category',array('class'=>'btn btn-primary btn-block')); }}
+        		{{ Form::submit( trans('admin.save_category') ,array('class'=>'btn btn-primary btn-block')); }}
         		</div>
         	</div>
         	{{ Form::close()}}
diff --git a/app/views/admin/categories/list.blade.php b/app/views/admin/categories/list.blade.php
index 1932345..64ec1c8 100644
--- a/app/views/admin/categories/list.blade.php
+++ b/app/views/admin/categories/list.blade.php
@@ -1,20 +1,20 @@
-@section('title','Viewing categories')
+@section('title', trans('admin.viewing_category'))
 
 @section('content')
 <div class="container">
 	<div class="row">
 		<div class="col-lg-12">
 			<div class="page-header">
-			  <h1>Categories for Laravel tricks <span class="pull-right"> <a data-toggle="modal" href="#add_category" class="btn btn-primary btn-lg">Add new Category</a></span></h1>
+			  <h1>{{ trans('admin.category_for_tricks') }} <span class="pull-right"> <a data-toggle="modal" href="#add_category" class="btn btn-primary btn-lg">{{ trans('admin.add_new_category') }}</a></span></h1>
 			</div>
 
 			<table class="table">
 			   <thead>
 			     <tr>
-			       <th>Title</th>
-			       <th>Description</th>
-			       <th># of Tricks</th>
-			       <th class="col-lg-3 text-right">Actions</th>
+			       <th>{{ trans('admin.title') }}</th>
+			       <th>{{ trans('admin.description') }}</th>
+			       <th>{{ trans('admin.num_of_tricks') }}</th>
+			       <th class="col-lg-3 text-right">{{ trans('admin.actions') }}</th>
 			     </tr>
 			   </thead>
 			   <tbody id="sortable">
@@ -26,8 +26,8 @@
 			        <td>{{ $category->tricks->count()}}</td>
 			        <td>
 			        	<div class="btn-group pull-right">
-				        <a class="btn btn-primary btn-sm" href="{{url('admin/categories/view/'.$category->id)}}">Edit</a>
-				        <a class="delete_toggler btn btn-danger btn-sm" rel="{{$category->id}}">Delete</a>
+				        <a class="btn btn-primary btn-sm" href="{{url('admin/categories/view/'.$category->id)}}">{{ trans('admin.edit') }}</a>
+				        <a class="delete_toggler btn btn-danger btn-sm" rel="{{$category->id}}">{{ trans('admin.delete') }}</a>
 			        	</div>
 			        </td>
 			     </tr>
@@ -44,24 +44,24 @@
      <div class="modal-content">
        <div class="modal-header">
          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-         <h4 class="modal-title">Adding new category</h4>
+         <h4 class="modal-title">{{ trans('admin.adding_new_category') }}</h4>
        </div>
        <div class="modal-body">
        		@if($errors->all())
        		    <div class="bs-callout bs-callout-danger">
-       		        <h4>Please fix the errors below:</h4>
+       		        <h4>{{ trans('admin.please_fix_errors') }}</h4>
        		        {{ HTML::ul($errors->all())}}
        		    </div>
        		@endif
 			{{ Form::open(array('class'=>'form-horizontal'))}}
         	<div class="form-group">
-        	    <label for="title" class="col-lg-2 control-label">Name</label>
+        	    <label for="title" class="col-lg-2 control-label">{{ trans('admin.name') }}</label>
         	    <div class="col-lg-10">
         	    	{{ Form::text('name',null,array('class'=>'form-control'))}}
         	    </div>
         	</div>
             <div class="form-group">
-                <label for="url" class="col-lg-2 control-label">Description</label>
+                <label for="url" class="col-lg-2 control-label">{{ trans('admin.description') }}</label>
                 <div class="col-lg-10">
                     {{ Form::textarea('description',null,array('class'=>'form-control','rows'=>'4'))}}
                 </div>
@@ -84,14 +84,14 @@
      <div class="modal-content">
        <div class="modal-header">
          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-         <h4 class="modal-title">Are you sure?</h4>
+         <h4 class="modal-title">{{ trans('admin.are_you_sure') }}</h4>
        </div>
        <div class="modal-body">
-        	<p class="lead text-center">This Category will be deleted!</p>
+        	<p class="lead text-center">{{ trans('admin.category_will_be_deleted') }}</p>
        </div>
        <div class="modal-footer">
-        	<a data-dismiss="modal" href="#delete_category" class="btn btn-default">Keep</a>
-        	<a href="" id="delete_link" class="btn btn-danger">Delete</a>
+        	<a data-dismiss="modal" href="#delete_category" class="btn btn-default">{{ trans('admin.keep') }}</a>
+        	<a href="" id="delete_link" class="btn btn-danger">{{ trans('admin.delete') }}</a>
        </div>
      </div><!-- /.modal-content -->
    </div><!-- /.modal-dialog -->
diff --git a/app/views/admin/tags/edit.blade.php b/app/views/admin/tags/edit.blade.php
index 6002a6c..c64bf8e 100644
--- a/app/views/admin/tags/edit.blade.php
+++ b/app/views/admin/tags/edit.blade.php
@@ -1,29 +1,29 @@
-@section('title','Editing tag')
+@section('title', trans('admin.editing_tag'))
 
 @section('content')
 <div class="container">
 	<div class="row">
 		<div class="col-lg-6"> 
 			<div class="page-header">
-			  	<h1>Editing a tag <a href="{{ url('admin/tags')}}" class="btn btn-lg btn-default pull-right">Cancel</a></h1>
+			  	<h1>{{ trans('admin.editing_a_tag') }} <a href="{{ url('admin/tags')}}" class="btn btn-lg btn-default pull-right">{{ trans('admin.cancel') }}</a></h1>
 			</div>
             @if($errors->all())
                 <div class="bs-callout bs-callout-danger">
-                    <h4>Please fix the errors below:</h4>
+                    <h4>{{ trans('admin.please_fix_errors') }}</h4>
                     {{ HTML::ul($errors->all())}}
                 </div>
             @endif
 
 			{{ Form::model($tag,array('class'=>'form-horizontal'))}}
         	<div class="form-group">
-        	    <label for="name" class="col-lg-2 control-label">Name</label>
+        	    <label for="name" class="col-lg-2 control-label">{{ trans('admin.name') }}</label>
         	    <div class="col-lg-10">
         	    	{{ Form::text('name',$tag->name,array('class'=>'form-control'))}}
         	    </div>
         	</div>
         	<div class="form-group">
         		<div class="col-lg-10 col-lg-offset-2">
-        		{{ Form::submit('Save tag',array('class'=>'btn btn-primary btn-block')); }}
+        		{{ Form::submit(trans('admin.save_tag'), array('class'=>'btn btn-primary btn-block')); }}
         		</div>
         	</div>
         	{{ Form::close()}}
diff --git a/app/views/admin/tags/list.blade.php b/app/views/admin/tags/list.blade.php
index d7f61ec..2826b89 100644
--- a/app/views/admin/tags/list.blade.php
+++ b/app/views/admin/tags/list.blade.php
@@ -1,11 +1,11 @@
-@section('title','Viewing tags')
+@section('title', trans('admin.viewing_tags'))
 
 @section('content')
 <div class="container">
 	<div class="row">
 		<div class="col-lg-12"> 
 			<div class="page-header">
-			  <h1>All Tags <span class="pull-right"><a data-toggle="modal" href="#add_tag" class="btn btn-primary btn-lg">Add new Tag</a></span></h1>
+			  <h1>{{ trans('admin.all_tags') }} <span class="pull-right"><a data-toggle="modal" href="#add_tag" class="btn btn-primary btn-lg">{{ trans('admin.add_new_tag') }}</a></span></h1>
 			</div>
 		</div>
 	</div>
@@ -14,8 +14,8 @@
 			<table class="table">
 			   <thead>
 			     <tr>
-			       <th>Tag</th>
-			       <th class="col-lg-3 text-right">Actions</th>
+			       <th>{{ trans('admin.tag') }}</th>
+			       <th class="col-lg-3 text-right">{{ trans('admin.actions') }}</th>
 			     </tr>
 			   </thead>
 			   <tbody>
@@ -24,8 +24,8 @@
 			        <td><a href="{{url('admin/tags/view/'.$tag->id)}}">{{ $tag->name }}</a></td>
 			        <td>
 			        	<div class="btn-group pull-right">
-				        <a class="btn btn-primary btn-sm" href="{{url('admin/tags/view/'.$tag->id)}}">Edit</a> 
-				        <a class="delete_toggler btn btn-danger btn-sm" rel="{{$tag->id}}">Delete</a>
+				        <a class="btn btn-primary btn-sm" href="{{url('admin/tags/view/'.$tag->id)}}">{{ trans('admin.edit') }}</a> 
+				        <a class="delete_toggler btn btn-danger btn-sm" rel="{{$tag->id}}">{{ trans('admin.delete') }}</a>
 			        	</div>
 			        </td>
 			     </tr>
@@ -42,25 +42,25 @@
      <div class="modal-content">
        <div class="modal-header">
          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-         <h4 class="modal-title">Adding new Tag</h4>
+         <h4 class="modal-title">{{ trans('admin.adding_new_tags') }}</h4>
        </div>
        <div class="modal-body">
        		@if($errors->all())
        		    <div class="bs-callout bs-callout-danger">
-       		        <h4>Please fix the errors below:</h4>
+       		        <h4>{{ trans('admin.please_fix_errors') }}</h4>
        		        {{ HTML::ul($errors->all())}}
        		    </div>
        		@endif
 			{{ Form::open(array('class'=>'form-horizontal'))}}
         	<div class="form-group">
-        	    <label for="title" class="col-lg-2 control-label">Name</label>
+        	    <label for="title" class="col-lg-2 control-label">{{ trans('admin.name') }}</label>
         	    <div class="col-lg-10">
         	    	{{ Form::text('name',null,array('class'=>'form-control'))}}
         	    </div>
         	</div>
         	<div class="form-group">
         		<div class="col-lg-10 col-lg-offset-2">
-        		{{ Form::submit('Create',array('class'=>'btn btn-lg btn-primary btn-block')); }}
+        		{{ Form::submit(trans('admin.create') ,array('class'=>'btn btn-lg btn-primary btn-block')); }}
         		</div>
         	</div>
         	{{ Form::close()}}
@@ -76,14 +76,14 @@
      <div class="modal-content">
        <div class="modal-header">
          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-         <h4 class="modal-title">Are you sure?</h4>
+         <h4 class="modal-title">{{ trans('admin.are_you_sure') }}</h4>
        </div>
        <div class="modal-body">
-        	<p class="lead text-center">This Tag will be deleted!</p>
+        	<p class="lead text-center">{{ trans('admin.tag_will_be_deleted') }}</p>
        </div>
        <div class="modal-footer">
-        	<a data-dismiss="modal" href="#delete_tag" class="btn btn-default">Keep</a>
-        	<a href="" id="delete_link" class="btn btn-danger">Delete</a>
+        	<a data-dismiss="modal" href="#delete_tag" class="btn btn-default">{{ trans('admin.keep') }}</a>
+        	<a href="" id="delete_link" class="btn btn-danger">{{ trans('admin.delete') }}</a>
        </div>
      </div><!-- /.modal-content -->
    </div><!-- /.modal-dialog -->
diff --git a/app/views/admin/users/list.blade.php b/app/views/admin/users/list.blade.php
index 253397c..6525694 100644
--- a/app/views/admin/users/list.blade.php
+++ b/app/views/admin/users/list.blade.php
@@ -1,11 +1,11 @@
-@section('title','Viewing users')
+@section('title', trans('admin.viewing_users'))
 
 @section('content')
 <div class="container">
 	<div class="row">
 		<div class="col-lg-12">
 			<div class="page-header">
-				<h1>Showing all users ({{ $users->getTotal() }})</h1>
+				<h1>{{ trans('admin.showing_all_users') }} ({{ $users->getTotal() }})</h1>
 			</div>
 		</div>
 	</div>
@@ -14,12 +14,12 @@
 			<table class="table">
 			   	<thead>
 			    	<tr>
-				     	<th>Avatar</th>
-						<th>Username</th>
-						<th>Email</th>
-						<th>Tricks</th>
-						<th>Date Registered</th>
-						<th>Github Profile?</th>
+				     	<th>{{ trans('admin.avatar') }}</th>
+						<th>{{ trans('admin.username') }}</th>
+						<th>{{ trans('admin.email') }}</th>
+						<th>{{ trans('admin.tricks') }}</th>
+						<th>{{ trans('admin.date_registered') }}</th>
+						<th>{{ trans('admin.github_profile') }}</th>
 			    	</tr>
 			   	</thead>
 			   	<tbody>