Skip to content

Change "force active" to "did not pay" #2

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

Open
jakob-dunning wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change "force active" to "did not pay" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion includes/pages/admin_active.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ function admin_active()
'shift_count' => __('Shifts'),
'work_time' => __('Length'),
'active' => __('Active?'),
'force_active' => __('Forced'),
'force_active' => __('Did not pay'),
'tshirt' => __('T-shirt?'),
'actions' => ''
], $matched_users),
Expand Down
4 changes: 2 additions & 2 deletions includes/pages/admin_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ function admin_user()
$html .= ' <tr><td>Aktiv</td><td>' . "\n";
$html .= html_options('eAktiv', $options, $user_source->state->active) . '</td></tr>' . "\n";

// Aktiv erzwingen
// Hat nicht bezahlt
if (auth()->can('admin_active')) {
$html .= ' <tr><td>' . __('Force active') . '</td><td>' . "\n";
$html .= ' <tr><td>' . __('Did not pay') . '</td><td>' . "\n";
$html .= html_options('force_active', $options, $user_source->state->force_active) . '</td></tr>' . "\n";
}

Expand Down
4 changes: 2 additions & 2 deletions includes/view/User_view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ function Users_view(
$user_table_headers['got_voucher'] = Users_table_header_link('got_voucher', __('Voucher'), $order_by);
$user_table_headers['sum_hours_rostered'] = Users_table_header_link('sum_hours_rostered', __('Sum hours rostered'), $order_by);
$user_table_headers['active'] = Users_table_header_link('active', __('Active'), $order_by);
$user_table_headers['force_active'] = Users_table_header_link('force_active', __('Forced'), $order_by);
$user_table_headers['force_active'] = Users_table_header_link('force_active', __('Did not pay'), $order_by);
$user_table_headers['got_shirt'] = Users_table_header_link('got_shirt', __('T-Shirt'), $order_by);
$user_table_headers['shirt_size'] = Users_table_header_link('shirt_size', __('Size'), $order_by);
$user_table_headers['arrival_date'] = Users_table_header_link(
Expand Down Expand Up @@ -779,7 +779,7 @@ function User_view_state_admin($freeloader, $user_source)
. '</span>';

if ($user_source->state->force_active) {
$state[] = '<span class="text-success">' . __('Active (forced)') . '</span>';
$state[] = '<span class="text-success">' . __('Active (did not pay)') . '</span>';
} elseif ($user_source->state->active) {
$state[] = '<span class="text-success">' . __('Active') . '</span>';
}
Expand Down
12 changes: 6 additions & 6 deletions resources/lang/de_DE/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,8 +1032,8 @@ msgid "Active?"
msgstr "Aktiv?"

#: includes/pages/admin_active.php:320 includes/view/User_view.php:231
msgid "Forced"
msgstr "Gezwungen"
msgid "Did not pay"
msgstr "Hat nicht bezahlt"

#: includes/pages/admin_active.php:321
msgid "T-shirt?"
Expand Down Expand Up @@ -1536,8 +1536,8 @@ msgid "No"
msgstr "Nein"

#: includes/pages/admin_user.php:95
msgid "Force active"
msgstr "Aktiv erzwingen"
msgid "Did not pay"
msgstr "Hat nicht bezahlt"

#: includes/pages/admin_user.php:112
msgid ""
Expand Down Expand Up @@ -2701,8 +2701,8 @@ msgid "Arrived at %s"
msgstr "Angekommen am %s"

#: includes/view/User_view.php:732
msgid "Active (forced)"
msgstr "Aktiv (gezwungen)"
msgid "Active (did not pay)"
msgstr "Aktiv (hat nicht bezahlt)"

#: includes/view/User_view.php:743
#, php-format
Expand Down