Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation of forum views en/pl #156

Merged
merged 6 commits into from
Jan 24, 2018
Merged

Translation of forum views en/pl #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3630dd
Translation of forum views
VerioPL Jan 24, 2018
cef1a8a
Fix for forum index view
VerioPL Jan 24, 2018
24ae4f7
Another fix for forum index view
VerioPL Jan 24, 2018
992b549
Fix for pl lang in forum views
VerioPL Jan 24, 2018
dfd1b37
Visual change for topic view in forum views
VerioPL Jan 24, 2018
ce87b3f
Fix for memeber-since var in forum views
VerioPL Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions resources/lang/en/common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@
'community' => 'Community',
'buffer' => 'Buffer',
'times' => 'Times',
'name' => 'Name',
'add' => 'Add',
'name' => 'Name',
'add' => 'Add',
'remove' => 'Remove',
'staff' => 'Staff',
'blacklist' => 'Blacklist',
'fl_tokens' => 'Freeleech Tokens',
Expand Down Expand Up @@ -75,4 +76,7 @@
'amount' => 'Amount',
'my' => 'My',
'no-result' => 'There is no result in database for query',
'search-results' => 'Search results',
'search-results-desc' => 'Please see your results below',
'permalink' => 'Permalink',
];
32 changes: 30 additions & 2 deletions resources/lang/en/forum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,34 @@
'read-topic' => 'Read the topic',
'mark-as-resolved' => 'Lock Topic',
'delete-topic' => 'Delete this topic',
'display-forum' => 'Show topics in ',
'edit-topic' => 'Edit Topic'
'display-forum' => 'Show topics in ',
'edit-topic' => 'Edit Topic',
'stats' => 'Stats',
'last-message' => 'Last message',
'last-post-info' => 'Last post info',
'closed' => 'Closed',
'approved' => 'Approved',
'denied' => 'Denied',
'solved' => 'Solved',
'invalid' => 'Invalid',
'bug' => 'Bug',
'suggestion' => 'Suggestion',
'implemented' => 'Implemented',
'topic-name' => 'Topic name',
'current' => 'Current',
'topic-quick-search' => 'Topic name quick search',
'name' => 'Name',
'latest' => 'Latest',
'in' => 'In',
'edit-post' => 'Edycja posta',
'quote' => 'Quote',
'like-post' => 'Like this post',
'dislike-post' => 'Dislike this post',
'topic-closed' => 'This topic is closed',
'not-connected' => 'You must be connected',
'moderation' => 'Moderation',
'open-topic' => 'Open this topic',
'pin' => 'Pin',
'unpin' => 'Unpin',
'label-system' => 'Label system',
];
1 change: 1 addition & 0 deletions resources/lang/en/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@

return [
'my-profile' => 'My Profile',
'member-since' => 'Member since',
];
8 changes: 6 additions & 2 deletions resources/lang/pl/common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@
'community' => 'Społeczność',
'buffer' => 'Bufor',
'times' => 'razy',
'name' => 'Nazwa',
'add' => 'Dodaj',
'name' => 'Nazwa',
'add' => 'Dodaj',
'remove' => 'Usuń',
'staff' => 'Zespół',
'blacklist' => 'Czarna lista',
'fl_tokens' => 'Tokeny Freeleech',
Expand Down Expand Up @@ -75,4 +76,7 @@
'amount' => 'Ilość',
'my' => 'Moje',
'no-result' => 'Brak odpowiadających wyników w bazie danych',
'search-results' => 'Wyniki wyszukiwania',
'search-results-desc' => 'Poniżej znajdziesz wyniki wyszukiwanej frazy',
'permalink' => 'Bezpośredni odnośnik',
];
32 changes: 30 additions & 2 deletions resources/lang/pl/forum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,34 @@
'read-topic' => 'Przeczytaj wątek',
'mark-as-resolved' => 'Zablokuj wątek',
'delete-topic' => 'Usuń wątek',
'display-forum' => 'Pokaż wątki w ',
'edit-topic' => 'Edytuj wątek'
'display-forum' => 'Pokaż wątki w ',
'edit-topic' => 'Edytuj wątek',
'stats' => 'Statystyki',
'last-message' => 'Ostatnia wiadomość',
'last-post-info' => 'Informacje ostatniego wpisu',
'closed' => 'Zamknięte',
'approved' => 'Zaakceptowane',
'denied' => 'Odrzucone',
'solved' => 'Rozwiązane',
'invalid' => 'Nieprawidłowe',
'bug' => 'Błędne',
'suggestion' => 'Propozycja',
'implemented' => 'Wdrożone',
'topic-name' => 'Nazwa wątku',
'current' => 'Bieżące',
'topic-quick-search' => 'Szybkie szukanie wątku',
'name' => 'Nazwa',
'latest' => 'Ostatnie',
'in' => 'W',
'edit-post' => 'Edycja posta',
'quote' => 'Cytat',
'like-post' => 'Lubię ten post',
'dislike-post' => 'Nie lubię tego posta',
'topic-closed' => 'Ten wątek jest zamknięty',
'not-connected' => 'Musisz być połączony',
'moderation' => 'Moderacja',
'open-topic' => 'Otwórz ten wątek',
'pin' => 'Przypnij',
'unpin' => 'Odepnij',
'label-system' => 'System etykiet',
];
1 change: 1 addition & 0 deletions resources/lang/pl/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@

return [
'my-profile' => 'Mój profil',
'member-since' => 'Użytkownik od',
];
4 changes: 2 additions & 2 deletions resources/views/forum/category.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<tr>
<th></th>
<th>{{ trans('forum.forum') }}</th>
<th>Stats</th>
<th>Last message</th>
<th>{{ trans('forum.stats') }}</th>
<th>{{ trans('forum.last-message') }}</th>
</tr>
</thead>
<tbody>
Expand Down
24 changes: 12 additions & 12 deletions resources/views/forum/display.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<thead>
<tr>
<th></th>
<th>Topic</th>
<th>Started by</th>
<th>Stats</th>
<th>Last Post Info</th>
<th>{{ trans('forum.topic') }}</th>
<th>{{ trans('forum.author') }}</th>
<th>{{ trans('forum.stats') }}</th>
<th>{{ trans('forum.last-post-info') }}</th>
</tr>
</thead>
<tbody>
Expand All @@ -53,14 +53,14 @@
@endif
<td class="f-display-topic-title">
<strong><a href="{{ route('forum_topic', array('slug' => $t->slug, 'id' => $t->id)) }}">{{ $t->name }}</a></strong>
@if($t->state == "close") <span class='label label-sm label-default'>CLOSED</span> @endif
@if($t->approved == "1") <span class='label label-sm label-success'>APPROVED</span> @endif
@if($t->denied == "1") <span class='label label-sm label-danger'>DENIED</span> @endif
@if($t->solved == "1") <span class='label label-sm label-info'>SOLVED</span> @endif
@if($t->invalid == "1") <span class='label label-sm label-warning'>INVALID</span> @endif
@if($t->bug == "1") <span class='label label-sm label-danger'>BUG</span> @endif
@if($t->suggestion == "1") <span class='label label-sm label-primary'>SUGGESTION</span> @endif
@if($t->implemented == "1") <span class='label label-sm label-success'>IMPLEMENTED</span> @endif
@if($t->state == "close") <span class='label label-sm label-default'>{{ strtoupper(trans('forum.closed')) }}</span> @endif
@if($t->approved == "1") <span class='label label-sm label-success'>{{ strtoupper(trans('forum.approved')) }}</span> @endif
@if($t->denied == "1") <span class='label label-sm label-danger'>{{ strtoupper(trans('forum.denied')) }}</span> @endif
@if($t->solved == "1") <span class='label label-sm label-info'>{{ strtoupper(trans('forum.solved')) }}</span> @endif
@if($t->invalid == "1") <span class='label label-sm label-warning'>{{ strtoupper(trans('forum.invalid')) }}</span> @endif
@if($t->bug == "1") <span class='label label-sm label-danger'>{{ strtoupper(trans('forum.bug')) }}</span> @endif
@if($t->suggestion == "1") <span class='label label-sm label-primary'>{{ strtoupper(trans('forum.suggestion')) }}</span> @endif
@if($t->implemented == "1") <span class='label label-sm label-success'>{{ strtoupper(trans('forum.implemented')) }}</span> @endif
</td>
<td class="f-display-topic-started"><a href="{{ route('profil', ['username' => $t->first_post_user_username, 'id' => $t->first_post_user_id]) }}">{{ $t->first_post_user_username }}</a></td>
<td class="f-display-topic-stats">
Expand Down
8 changes: 4 additions & 4 deletions resources/views/forum/edit_topic.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@stop

@section('meta')
<meta name="description" content="Edit Topic">
<meta name="description" content="{{ trans('forum.edit-topic') }}">
@stop

@section('breadcrumb')
Expand All @@ -32,14 +32,14 @@
<h2><span>{{ trans('forum.edit-topic') }}</span></h2>
{{ Form::open(array('route' => array('forum_edit_topic', 'slug' => $topic->slug, 'id' => $topic->id))) }}
<div class="form-group">
<label for="forum_name">Topic Name</label>
<label for="forum_name">{{ trans('forum.topic-name') }}</label>
<input id="name" type="text" name="name" maxlength="75" class="form-control" placeholder="{{ trans('forum.topic-title') }}" value="{{ $topic->name }}" required>
</div>

<div class="form-group">
<label for="forum_id">Forum</label>
<label for="forum_id">{{ trans('forum.forum') }}</label>
<select name="forum_id" class="form-control">
<option value="{{ $topic->forum_id }}" selected>{{ $topic->forum->name }} (Current)</option>
<option value="{{ $topic->forum_id }}" selected>{{ $topic->forum->name }} ({{ trans('forum.current') }})</option>
@foreach($categories as $c)
<option value="{{ $c->id }}">{{ $c->name }}</option>
@endforeach
Expand Down
18 changes: 9 additions & 9 deletions resources/views/forum/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@stop

@section('meta')
<meta name="description" content="{{ Config::get('other.title') . 'Forums' }}">
<meta name="description" content="{{ Config::get('other.title') }} - {{ trans('forum.forums') }}">
@stop


Expand All @@ -19,9 +19,9 @@

@section('content')
<div class="box container">
<span class="badge-user" style="float: right;"><strong>{{ trans('forum.forums') }}:</strong> {{ $num_forums }} | <strong>Topics:</strong> {{ $num_topics }} | <strong>Posts:</strong> {{ $num_posts }}</span>
<span class="badge-user" style="float: right;"><strong>{{ trans('forum.forums') }}:</strong> {{ $num_forums }} | <strong>{{ trans('forum.topics') }}:</strong> {{ $num_topics }} | <strong>{{ trans('forum.posts') }}:</strong> {{ $num_posts }}</span>
{{ Form::open(array('route' => 'forum_search')) }}
<input type="text" name="name" id="name" placeholder="Topic Name Quick Search" class="form-control">
<input type="text" name="name" id="name" placeholder="{{ trans('forum.topic-quick-search') }}" class="form-control">
{{ Form::close() }}
<div class="forum-categories">
@foreach($categories as $category)
Expand All @@ -36,10 +36,10 @@
<thead class="head">
<tr>
<td> </td>
<td>NAME</td>
<td>POSTS</td>
<td>TOPICS</td>
<td>LATEST</td>
<td>{{ strtoupper(trans('forum.name')) }}</td>
<td>{{ strtoupper(trans('forum.posts')) }}</td>
<td>{{ strtoupper(trans('forum.topics')) }}</td>
<td>{{ strtoupper(trans('forum.latest')) }}</td>
</tr>
</thead>
<tbody>
Expand All @@ -53,9 +53,9 @@
<td>{{ $categoryChild->num_post }}</td>
<td>{{ $categoryChild->num_topic }}</td>
<td>
<span>Last Post By <i class="fa fa-user"></i> <a href="{{ route('profil', ['username' => $categoryChild->last_post_user_username, 'id' => $categoryChild->last_post_user_id]) }}"> {{ $categoryChild->last_post_user_username }}</a></span>
<span>{{ trans('forum.last-message') }} - {{ strtolower(trans('forum.author')) }} <i class="fa fa-user"></i> <a href="{{ route('profil', ['username' => $categoryChild->last_post_user_username, 'id' => $categoryChild->last_post_user_id]) }}"> {{ $categoryChild->last_post_user_username }}</a></span>
<br>
<span>In <i class="fa fa-chevron-right"></i><a href="{{ route('forum_topic', array('slug' => $categoryChild->last_topic_slug, 'id' => $categoryChild->last_topic_id)) }}"> {{ $categoryChild->last_topic_name }}</a></span>
<span>{{ trans('forum.topic') }} <i class="fa fa-chevron-right"></i><a href="{{ route('forum_topic', array('slug' => $categoryChild->last_topic_slug, 'id' => $categoryChild->last_topic_id)) }}"> {{ $categoryChild->last_topic_name }}</a></span>
<br>
<span><i class="fa fa-clock-o"></i> {{ $categoryChild->updated_at->diffForHumans() }}</span>
</td>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/forum/new_topic.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@stop

@section('meta')
<meta name="description" content="{{ 'Create a new topic in ' . $forum->name }}">
<meta name="description" content="{{ $forum->name . ' - ' . trans('forum.create-new-topic') }}">
@stop

@section('stylesheets')
Expand Down
4 changes: 2 additions & 2 deletions resources/views/forum/post_edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@stop

@section('meta')
<meta name="description" content="{{ 'Edit Post In ' . $forum->name }}">
<meta name="description" content="{{ $forum->name . ' - ' . trans('forum.edit-post') }}">
@stop

@section('stylesheets')
Expand Down Expand Up @@ -49,7 +49,7 @@
@endif

<div class="col-md-12">
<h2>{{ trans('common.edit') }} {{ trans('forum.post') }} In: {{ $forum->name }}</h2>
<h2>{{ trans('common.edit') }} {{ trans('forum.post') }} {{ strtolower(trans('forum.in')) }}: {{ $forum->name }}</h2>
{{ Form::open(array('route' => array('forum_post_edit', 'slug' => $topic->slug, 'id' => $topic->id, 'postId' => $post->id))) }}
{{ csrf_field() }}

Expand Down
32 changes: 16 additions & 16 deletions resources/views/forum/results.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</li>
<li>
<a href="#" itemprop="url" class="l-breadcrumb-item-link">
<span itemprop="title" class="l-breadcrumb-item-link-title">Search Results</span>
<span itemprop="title" class="l-breadcrumb-item-link-title">{{ trans('common.search-results') }}</span>
</a>
</li>
@stop
Expand All @@ -25,18 +25,18 @@
<div class="box container">
<div class="f-display">
<div class="f-display-info col-md-12">
<h1 class="f-display-info-title">Search Results</h1>
<p class="f-display-info-description">Please See Your Results Below</p>
<h1 class="f-display-info-title">{{ trans('common.search-results') }}</h1>
<p class="f-display-info-description">{{ trans('common.search-results-desc') }}</p>
</div>
<div class="f-display-table-wrapper col-md-12">
<table class="f-display-topics table col-md-12">
<thead>
<tr>
<th>Forum</th>
<th>Topic</th>
<th>Started by</th>
<th>Stats</th>
<th>Last Post Info</th>
<th>{{ trans('forum.forum') }}</th>
<th>{{ trans('forum.topic') }}</th>
<th>{{ trans('forum.author') }}</th>
<th>{{ trans('forum.stats') }}</th>
<th>{{ trans('forum.last-post-info') }}</th>
</tr>
</thead>
<tbody>
Expand All @@ -45,20 +45,20 @@
<td class="f-display-topic-icon"><span class="badge-extra text-bold">{{ $r->forum->name }}</span></td>
<td class="f-display-topic-title">
<strong><a href="{{ route('forum_topic', array('slug' => $r->slug, 'id' => $r->id)) }}">{{ $r->name }}</a></strong>
@if($r->state == "close") <span class='label label-sm label-default'>CLOSED</span> @endif
@if($r->approved == "1") <span class='label label-sm label-success'>APPROVED</span> @endif
@if($r->denied == "1") <span class='label label-sm label-danger'>DENIED</span> @endif
@if($r->solved == "1") <span class='label label-sm label-info'>SOLVED</span> @endif
@if($r->invalid == "1") <span class='label label-sm label-warning'>INVALID</span> @endif
@if($r->bug == "1") <span class='label label-sm label-danger'>BUG</span> @endif
@if($r->suggestion == "1") <span class='label label-sm label-primary'>SUGGESTION</span> @endif
@if($r->state == "close") <span class='label label-sm label-default'>{{ strtoupper(trans('forum.closed')) }}</span> @endif
@if($r->approved == "1") <span class='label label-sm label-success'>{{ strtoupper(trans('forum.approved')) }}</span> @endif
@if($r->denied == "1") <span class='label label-sm label-danger'>{{ strtoupper(trans('forum.denied')) }}</span> @endif
@if($r->solved == "1") <span class='label label-sm label-info'>{{ strtoupper(trans('forum.solved')) }}</span> @endif
@if($r->invalid == "1") <span class='label label-sm label-warning'>{{ strtoupper(trans('forum.invaild')) }}</span> @endif
@if($r->bug == "1") <span class='label label-sm label-danger'>{{ strtoupper(trans('forum.bug')) }}</span> @endif
@if($r->suggestion == "1") <span class='label label-sm label-primary'>{{ strtoupper(trans('forum.suggestion')) }}</span> @endif
</td>
<td class="f-display-topic-started"><a href="{{ route('profil', ['username' => $r->first_post_user_username, 'id' => $r->first_post_user_id]) }}">{{ $r->first_post_user_username }}</a></td>
<td class="f-display-topic-stats">
{{ $r->num_post - 1 }} {{ trans('forum.replies') }} \ {{ $r->views }} {{ trans('forum.views') }}
</td>
<td class="f-display-topic-last-post">
<a href="{{ route('profil', ['username' => $r->last_post_user_username, 'id' => $r->last_post_user_id]) }}">{{ $r->last_post_user_username }}</a> on <time datetime="{{ date('d-m-Y h:m', strtotime($r->updated_at)) }}">
<a href="{{ route('profil', ['username' => $r->last_post_user_username, 'id' => $r->last_post_user_id]) }}">{{ $r->last_post_user_username }}</a>, <time datetime="{{ date('d-m-Y h:m', strtotime($r->updated_at)) }}">
{{ date('M d Y', strtotime($r->updated_at)) }}
</time>
</td>
Expand Down
Loading