From d7024c14f7d7367108503c3cc7c8a0f9a6154ad0 Mon Sep 17 00:00:00 2001 From: Leon Date: Fri, 2 Mar 2018 13:57:59 +0100 Subject: [PATCH 01/21] Begin translation --- resources/lang/en/about.php | 17 ++++++++ resources/lang/en/account.php | 43 +++++++++++++++++++ resources/lang/en/index.php | 12 ++++++ resources/lang/en/snippets.php | 31 +++++++++++++ resources/views/about.blade.php | 18 ++++---- resources/views/index.blade.php | 12 +++--- resources/views/login.blade.php | 12 +++--- resources/views/signup.blade.php | 24 +++++------ resources/views/snippets/link_table.blade.php | 14 +++--- resources/views/snippets/modals.blade.php | 2 +- resources/views/snippets/navbar.blade.php | 32 +++++++------- resources/views/snippets/user_table.blade.php | 14 +++--- 12 files changed, 167 insertions(+), 64 deletions(-) create mode 100644 resources/lang/en/about.php create mode 100644 resources/lang/en/account.php create mode 100644 resources/lang/en/index.php create mode 100644 resources/lang/en/snippets.php diff --git a/resources/lang/en/about.php b/resources/lang/en/about.php new file mode 100644 index 000000000..42367dfe2 --- /dev/null +++ b/resources/lang/en/about.php @@ -0,0 +1,17 @@ + [ + 'title' => 'Build Information', + 'version' => 'Version: :ver', + 'release' => 'Release date: :reldate', + 'appinstall' => 'App Install: :appname on :appaddress on :genat', + 'admin' => 'You are seeing the information above because you are logged in as an administrator.', + ], + 'about' => [ + 'powered' => ':app is powered by Polr 2, an open source, minimalist link shortening platform.', + 'learnmore' => 'Learn more at its GitHub page or its project site.', + 'license' => 'Polr is licensed under the GNU GPL License.', + ], + 'moreinfo' => 'More Information', +]; diff --git a/resources/lang/en/account.php b/resources/lang/en/account.php new file mode 100644 index 000000000..5149d60da --- /dev/null +++ b/resources/lang/en/account.php @@ -0,0 +1,43 @@ + [ + 'title' => 'Register', + 'question' => 'Don\'t have an account?', + 'register' => 'Register', + 'registerbtn' => 'Register', + 'form' => [ + 'username' => [ + 'label' => 'Username:', + 'placeholder' => 'Username', + 'help' => 'The username you will use to login to :app.', + ], + 'password' => [ + 'label' => 'Password:', + 'placeholder' => 'Password', + 'help' => 'The secure password you will use to login to :app.', + ], + 'email' => [ + 'label' => 'Email:', + 'placeholder' => 'Email', + 'help' => 'The email you will use to verify your account or to recover your account.', + ], + ], + ], + 'login' => [ + 'question' => 'Already have an account?', + 'login' => 'Login', + 'title' => 'Login', + 'loginbtn' => 'Login', + 'form' => [ + 'username' => 'Username', + 'password' => 'Password', + ], + ], + 'forgot' => [ + 'question' => 'Forgot your password?', + 'resetpasswd' => 'Reset', + ], + +]; diff --git a/resources/lang/en/index.php b/resources/lang/en/index.php new file mode 100644 index 000000000..08b4e5213 --- /dev/null +++ b/resources/lang/en/index.php @@ -0,0 +1,12 @@ + 'public', + 'private' => 'private', + 'checkavailability' => 'check availability', + 'linkoptions' => 'link options', + 'short' => 'shorten', + 'loadingtips' => 'Loading tips...' + +]; diff --git a/resources/lang/en/snippets.php b/resources/lang/en/snippets.php new file mode 100644 index 000000000..2764617c8 --- /dev/null +++ b/resources/lang/en/snippets.php @@ -0,0 +1,31 @@ + 'Toggle navigation', + 'about' => 'About', + 'signin' => 'Sign In', + 'signup' => 'Sign Up', + 'dashboard' => 'Dashboard', + 'settings' => 'Settings', + 'logout' => 'Logout', + 'login' => 'Login', + 'close' => 'Close', + 'linktable' => [ + 'linkending' => 'Link Ending', + 'longlink' => 'Long Link', + 'clicks' => 'Clicks', + 'date' => 'Date', + 'creator' => 'Creator', + 'disable' => 'Disable', + 'delete' => 'Delete', + ], + 'usertable' => [ + 'username' => 'Username', + 'email' => 'Email', + 'createdat' => 'Created At', + 'activated' => 'Activated', + 'api' => 'API', + 'role' => 'Role', + 'delete' => 'Delete', + ], +]; diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php index d2ac5339d..3ee622a30 100644 --- a/resources/views/about.blade.php +++ b/resources/views/about.blade.php @@ -13,20 +13,20 @@
@if ($role == "admin")
-

Build Information

-
Version: {{env('POLR_VERSION')}}
-
Release date: {{env('POLR_RELDATE')}}
-
App Install: {{env('APP_NAME')}} on {{env('APP_ADDRESS')}} on {{env('POLR_GENERATED_AT')}}
+

@lang('about.buildinfo.title')

+
@lang('about.buildinfo.version', ['ver' => env('POLR_VERSION')])
+
@lang('about.buildinfo.release', ['reldate' => env('POLR_RELDATE')])
+
@lang('about.buildinfo.appinstall', ['appname' => env('APP_NAME'), 'appaddress' => env('APP_ADDRESS'), 'genat' => env('POLR_GENERATED_AT')])
-

You are seeing the information above because you are logged in as an administrator.

+

@lang('about.buildinfo.admin')

@endif -

{{env('APP_NAME')}} is powered by Polr 2, an open source, minimalist link shortening platform. - Learn more at its Github page or its project site. -
Polr is licensed under the GNU GPL License. +

@lang('about.about.powered', ['app' => env('APP_NAME')]) + @lang('about.about.learnmore') +
@lang('about.about.license')

-More Information +@lang('about.moreinfo')
 Copyright (C) 2013-2017 Chaoyi Zha
 
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index cb75f1cb6..517d93a44 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -18,10 +18,10 @@ class='form-control long-link-input' placeholder='http://' name='link-url' />
         {{-- Show secret toggle only if using counter-based ending --}}
         
@endif @@ -32,18 +32,18 @@ class='form-control long-link-input' placeholder='http://' name='link-url' />
- Check Availability + @lang('index.checkavailability')
- - Link Options + + @lang('index.linkoptions')
- Loading Tips... + @lang('index.loadingtips')
@endsection diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index 511aaacc6..3982fb6e5 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -6,22 +6,22 @@ @section('content')
-

Login



+

@lang('account.login.title')



- - + + - +
diff --git a/resources/views/signup.blade.php b/resources/views/signup.blade.php index 58b4aa050..f8b55c11b 100644 --- a/resources/views/signup.blade.php +++ b/resources/views/signup.blade.php @@ -6,38 +6,38 @@ @section('content')
-

Register

+

@lang('account.register.title')

- Username: - Password: - Email: + @lang('account.register.form.username.label') + @lang('account.register.form.password.label') + @lang('account.register.form.email.label') @if (env('POLR_ACCT_CREATION_RECAPTCHA'))
@endif - +