Language improvements

Signed-off-by: Graham Campbell <graham@mineuk.com>
This commit is contained in:
Valentin PRUGNAUD
2015-01-05 11:12:34 +00:00
committed by Graham Campbell
parent 81bbccb3c4
commit 08a016ff2b
50 changed files with 920 additions and 281 deletions

View File

@@ -19,7 +19,7 @@ class AtomController extends Controller
{
$feed = Feed::make();
$feed->title = Setting::get('app_name');
$feed->description = 'Status Feed';
$feed->description = trans('cachet.feed');
$feed->link = Setting::get('app_domain');
$feed->setDateFormat('datetime');

View File

@@ -13,24 +13,24 @@ use Illuminate\Support\Facades\View;
class DashComponentController extends Controller
{
protected $subMenu = [];
protected $subTitle = 'Components';
public function __construct()
{
$this->subMenu = [
'components' => [
'title' => 'Components',
'title' => trans_choice('dashboard.components.components', 2),
'url' => URL::route('dashboard.components'),
'icon' => 'ion-ios-keypad',
'active' => false,
],
'groups' => [
'title' => 'Component Groups',
'title' => trans_choice('dashboard.components.groups.groups', 2),
'url' => URL::route('dashboard.components.groups'),
'icon' => 'ion-folder',
'active' => false,
],
];
$this->subTitle = trans_choice('dashboard.components.components', 2);
View::share('subTitle', $this->subTitle);
View::share('subMenu', $this->subMenu);
@@ -48,7 +48,7 @@ class DashComponentController extends Controller
$this->subMenu['components']['active'] = true;
return View::make('dashboard.components.index')->with([
'pageTitle' => 'Components - Dashboard',
'pageTitle' => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'),
'components' => $components,
'subMenu' => $this->subMenu,
]);
@@ -63,8 +63,8 @@ class DashComponentController extends Controller
{
$this->subMenu['groups']['active'] = true;
return View::make('dashboard.groups')->with([
'pageTitle' => 'Component Groups - Dashboard',
return View::make('dashboard.components.groups.index')->with([
'pageTitle' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'),
'groups' => ComponentGroup::all(),
'subMenu' => $this->subMenu,
]);
@@ -82,7 +82,7 @@ class DashComponentController extends Controller
$groups = ComponentGroup::all();
return View::make('dashboard.components.edit')->with([
'pageTitle' => 'Editing "'.$component->name.'" Component - Dashboard',
'pageTitle' => '"'.$component->name.'" - '.trans('dashboard.components.edit.title').' - '.trans('dashboard.dashboard'),
'component' => $component,
'groups' => $groups,
]);
@@ -113,7 +113,7 @@ class DashComponentController extends Controller
$groups = ComponentGroup::all();
return View::make('dashboard.components.add')->with([
'pageTitle' => 'Add Component - Dashboard',
'pageTitle' => trans('dashboard.components.add.title').' - '.trans('dashboard.dashboard'),
'groups' => $groups,
]);
}
@@ -153,7 +153,7 @@ class DashComponentController extends Controller
public function showAddComponentGroup()
{
return View::make('dashboard.components.add-group')->with([
'pageTitle' => 'Create Component Group',
'pageTitle' => trans('dashboard.components.groups.add.title').' - '.trans('dashboard.dashboard'),
]);
}

View File

@@ -21,7 +21,7 @@ class DashIncidentController extends Controller
$incidents = Incident::orderBy('created_at', 'desc')->get();
return View::make('dashboard.incidents.index')->with([
'pageTitle' => 'Incidents - Dashboard',
'pageTitle' => trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'),
'incidents' => $incidents,
]);
}
@@ -34,7 +34,7 @@ class DashIncidentController extends Controller
public function showAddIncident()
{
return View::make('dashboard.incidents.add')->with([
'pageTitle' => 'Add Incident - Dashboard',
'pageTitle' => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'),
]);
}
@@ -45,8 +45,8 @@ class DashIncidentController extends Controller
*/
public function showAddIncidentTemplate()
{
return View::make('dashboard.incidents.incident-template')->with([
'pageTitle' => 'Add Incident Template - Dashboard',
return View::make('dashboard.incidents.templates.add')->with([
'pageTitle' => trans('dashboard.incidents.templates.add.title').' - '.trans('dashboard.dashboard'),
]);
}
@@ -100,7 +100,7 @@ class DashIncidentController extends Controller
public function showEditIncidentAction(Incident $incident)
{
return View::make('dashboard.incidents.edit')->with([
'pageTitle' => 'Edit Incident - Dashboard',
'pageTitle' => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'),
'incident' => $incident,
]);
}

View File

@@ -18,25 +18,25 @@ class DashSettingsController extends Controller
{
$this->subMenu = [
'setup' => [
'title' => 'Application Setup',
'title' => trans('dashboard.settings.app-setup.app-setup'),
'url' => '/dashboard/settings/setup',
'icon' => 'ion-gear-b',
'active' => false,
],
'security' => [
'title' => 'Security',
'title' => trans('dashboard.settings.security.security'),
'url' => '/dashboard/settings/security',
'icon' => 'ion-lock-combination',
'active' => false,
],
'theme' => [
'title' => 'Theme',
'title' => trans('dashboard.settings.theme.theme'),
'url' => '/dashboard/settings/theme',
'icon' => 'ion-paintbrush',
'active' => false,
],
'stylesheet' => [
'title' => 'Stylesheet',
'title' => trans('dashboard.settings.stylesheet.stylesheet'),
'url' => '/dashboard/settings/stylesheet',
'icon' => 'ion-paintbucket',
'active' => false,

View File

@@ -19,7 +19,7 @@ class DashUserController extends Controller
public function showUser()
{
return View::make('dashboard.user.index')->with([
'pageTitle' => 'User - Dashboard',
'pageTitle' => trans('dashboard.team.profile').' - '.trans('dashboard.dashboard'),
]);
}

View File

@@ -36,7 +36,7 @@ class DashboardController extends Controller
$team = User::all();
return View::make('dashboard.team.index')->with([
'pageTitle' => 'Team Members - Dashboard',
'pageTitle' => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'),
'teamMembers' => $team,
]);
}
@@ -49,7 +49,7 @@ class DashboardController extends Controller
public function showTeamMemberView(User $user)
{
return View::make('dashboard.team.edit')->with([
'pageTitle' => 'Edit User - Dashboard',
'pageTitle' => trans('dashboard.team.edit.title').' - '.trans('dashboard.dashboard'),
'user' => $user,
]);
}
@@ -61,8 +61,8 @@ class DashboardController extends Controller
*/
public function showAddTeamMemberView()
{
return View::make('dashboard.team.new')->with([
'pageTitle' => 'Add User - Dashboard',
return View::make('dashboard.team.add')->with([
'pageTitle' => trans('dashboard.team.add.title').' - '.trans('dashboard.dashboard'),
]);
}
@@ -108,7 +108,7 @@ class DashboardController extends Controller
public function showMetrics()
{
return View::make('dashboard.metrics.index')->with([
'pageTitle' => 'Metrics - Dashboard',
'pageTitle' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'),
]);
}
@@ -120,7 +120,7 @@ class DashboardController extends Controller
public function showNotifications()
{
return View::make('dashboard.notifications.index')->with([
'pageTitle' => 'Notifications - Dashboard',
'pageTitle' => trans('dashboard.notifications.notifications').' - '.trans('dashboard.dashboard'),
]);
}
}

View File

@@ -20,7 +20,7 @@ class RssController extends Controller
$feed = RssFacade::feed('2.0', 'UTF-8');
$feed->channel([
'title' => Setting::get('app_name'),
'description' => 'Status Feed',
'description' => trans('cachet.feed'),
'link' => Setting::get('app_domain'),
]);

View File

@@ -31,7 +31,7 @@ class SetupController extends Controller
public function getIndex()
{
return View::make('setup')->with([
'pageTitle' => 'Setup',
'pageTitle' => trans('setup.setup'),
]);
}