Merge pull request #58 from Remo/patch-4

fix translation
CodepadME · Apr 24, 2014 · 2569c6d · 2569c6d
2 parents 12f43d0 + 8967bb8
commit 2569c6d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/lang/en/admin.php b/app/lang/en/admin.php
@@ -7,6 +7,7 @@
 	'add_new_category' => 'Add new Category',
 	'title' => 'Title',
 	'name' => 'Name',
+	'username' => 'Username',
 	'description' => 'Description',
 	'num_of_tricks' => '# of Tricks',
 	'actions' => 'Actions',
@@ -38,4 +39,4 @@
 	'date_registered' => 'Date Registered',
 	'github_profile' => 'Github Profile?',
 
-);
+);
diff --git a/app/views/admin/tags/list.blade.php b/app/views/admin/tags/list.blade.php
@@ -42,7 +42,7 @@
      <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">{{ trans('admin.adding_new_tags') }}</h4>
+         <h4 class="modal-title">{{ trans('admin.adding_new_tag') }}</h4>
        </div>
        <div class="modal-body">
        		@if($errors->all())
@@ -110,4 +110,4 @@
 
 </script>
 
-@stop
+@stop
diff --git a/app/views/tricks/new.blade.php b/app/views/tricks/new.blade.php
@@ -31,7 +31,7 @@
 			<div class="col-lg-8 col-lg-push-2 col-md-8 col-md-push-2 col-sm-12 col-xs-12">
 				<div class="content-box">
 					<h1 class="page-title">
-						{{ trans('tricks.create_new_trick') }}
+						{{ trans('tricks.creating_new_trick') }}
 					</h1>
 					@if(Session::get('errors'))
 					    <div class="alert alert-danger alert-dismissable">
@@ -45,7 +45,7 @@
 					{{ Form::open(array('class'=>'form-vertical','id'=>'save-trick-form','role'=>'form'))}}
 					    <div class="form-group">
 					    	<label for="title">{{ trans('tricks.title') }}</label>
-					    	{{Form::text('title', null, array('class'=>'form-control','placeholder'=>{{ trans('tricks.title_placeholder') }}));}}
+					    	{{Form::text('title', null, array('class'=>'form-control','placeholder'=>trans('tricks.title_placeholder') ));}}
 					    </div>
 					    <div class="form-group">
 					    	<label for="description">{{ trans('tricks.description') }}</label>
@@ -65,7 +65,7 @@
 					    <div class="form-group">
 					        <div class="text-right">
 					          <button type="submit"  id="save-section" class="btn btn-primary ladda-button" data-style="expand-right">
-					            trans('tricks.save_trick')
+					            {{ trans('tricks.save_trick') }}
 					          </button>
 					        </div>
 					    </div>