diff --git a/app/Console/Commands/AssignDataVolunteeringSkill.php b/app/Console/Commands/AssignDataVolunteeringSkill.php deleted file mode 100644 index ed1938bb93..0000000000 --- a/app/Console/Commands/AssignDataVolunteeringSkill.php +++ /dev/null @@ -1,126 +0,0 @@ -discourseService = $discourseService; - - // It might make sense to put all of this information into - // a 'quests' table, containing information about each quest - // and corresponding badges. - $this->dataBadges[] = ['name' => 'FaultCat', 'id' => 117]; - $this->dataBadges[] = ['name' => 'MiscCat', 'id' => 118]; - $this->dataBadges[] = ['name' => 'MobiFix', 'id' => 121]; - $this->dataBadges[] = ['name' => 'DataDelver', 'id' => 106]; - - $this->quests[] = ['name' => 'FaultCat', 'opinions_table' => 'devices_faults_opinions']; - $this->quests[] = ['name' => 'MiscCat', 'opinions_table' => 'devices_misc_opinions']; - $this->quests[] = ['name' => 'MobiFix', 'opinions_table' => 'devices_faults_mobiles_opinions']; - $this->quests[] = ['name' => 'MobiFixOra', 'opinions_table' => 'devices_faults_mobiles_ora_opinions']; - } - - /** - * Execute the console command. - * - * @return mixed - */ - public function handle() - { - $dataVolunteerSkill = Skills::where('skill_name', 'Data volunteering')->first(); - - $this->info("\nProcessing data badgers..."); - $this->processDataBadgers($dataVolunteerSkill); - - $this->info("\nProcessing questers..."); - $this->processQuesters($dataVolunteerSkill); - } - - public function processDataBadgers($dataVolunteerSkill) - { - foreach ($this->dataBadges as $dataBadge) { - $badgeId = $dataBadge['id']; - $badgeName = $dataBadge['name']; - - $this->info("Processing {$badgeName} badge..."); - $badgers = $this->discourseService->getUserIdsByBadge($badgeId); - - foreach ($badgers as $badger) { - $id = $badger['external_id']; - $username = $badger['username']; - - $user = User::find($id); - if (empty($user)) { - $this->error("Remote user '{$username}' not found locally with id #{$id}"); - continue; - } - - $this->checkAndAssignSkillToUser($user, $dataVolunteerSkill); - } - } - } - - public function processQuesters($dataVolunteerSkill) - { - foreach ($this->quests as $quest) { - $questName = $quest['name']; - $questOpinionsTable = $quest['opinions_table']; - - $this->info("Processing {$questName} quest..."); - $userIds = DB::table($questOpinionsTable) - ->select('user_id') - ->where('user_id', '<>', 0) - ->groupBy('user_id') - ->get(); - - foreach ($userIds as $userId) { - $user = User::find($userId->user_id); - $this->checkAndAssignSkillToUser($user, $dataVolunteerSkill); - } - } - } - - public function checkAndAssignSkillToUser($user, $dataVolunteerSkill) - { - $this->info("Checking #{$user->id} ({$user->username})..."); - if ($user->hasSkill($dataVolunteerSkill)) { - $this->warn('Already has data volunteering skill.'); - } else { - $this->info('Attaching data volunteering skill'); - $user->assignSkill($dataVolunteerSkill); - } - } -} diff --git a/app/Console/Commands/CheckTranslations.php b/app/Console/Commands/CheckTranslations.php index 41acdfaf51..7c1418294a 100644 --- a/app/Console/Commands/CheckTranslations.php +++ b/app/Console/Commands/CheckTranslations.php @@ -40,6 +40,8 @@ public function handle() // We want to scan all English translations. $files = scandir(base_path() . '/lang/en'); + $count = 0; + foreach ($files as $file) { if ($file == '_json.php') { // This is a special case used for data from the DB. Ignore it. @@ -65,13 +67,17 @@ public function handle() foreach (['fr-BE', 'fr'] as $other) { // First we want to check if the translation is used in the code. If it's not, then we // will want to remove it and it doesn't matter if it is not translated properly. - if (!$this->usedInCode("$group.$key")) { + if (strpos("$group.$key", 'groups.tag-') === 0) { + // This is valid - it's used in a constructed way. + } else if (!$this->usedInCode("$group.$key")) { error_log("ERROR: translation key $group.$key not used in code so far as we can tell"); + $count++; } else if (!\Lang::has("$group.$key", $other, false)) { // This is an error. If the translated value would be different, then we need to translate // it. If it would be the same, then the code would work using fallbacks, but we translate // it anyway so that this check doesn't give errors. error_log("ERROR: translation key $group.$key not translated into $other, in English: $value"); + $count++; } else { // Occasionally we want to check whether the translated values are the same as the English // ones. This might either be legit (as above) or might be a cut & paste error. @@ -80,12 +86,15 @@ public function handle() // json_encode for comparison as it may be a string or an array. if (json_encode($translated) == json_encode($value)) { // error_log("ERROR translation key $group.$key in $other is the same as English, " . json_encode($value)); +// $count++; } } } } } } + + return $count; } private function usedInCode($key) { diff --git a/app/Device.php b/app/Device.php index 0c000f6f07..931f6572df 100644 --- a/app/Device.php +++ b/app/Device.php @@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Str; use OwenIt\Auditing\Contracts\Auditable; +use Cache; class Device extends Model implements Auditable { @@ -430,43 +431,50 @@ public static function getItemTypes() // used by the item types. // // MAX is used to suppress errors when SQL mode is not set to ONLY_FULL_GROUP_BY. - $types = DB::select(DB::raw(" + // + // This is slow and the results don't change much, so we use a cache. + if (Cache::has('item_types')) { + $types = Cache::get('item_types'); + } else { + $types = DB::select(DB::raw(" SELECT TRIM(item_type) AS item_type, MAX(powered) AS powered, MAX(idcategories) AS idcategories, MAX(categoryname) AS categoryname - FROM (SELECT DISTINCT s.* + FROM (SELECT DISTINCT s.* FROM (SELECT TRIM(item_type) AS item_type, MAX(powered) AS powered, MAX(idcategories) AS idcategories, - categories.name AS categoryname, - COUNT(*) AS count - FROM devices - INNER JOIN categories - ON devices.category = categories.idcategories - WHERE item_type IS NOT NULL - GROUP BY categoryname, + categories.name AS categoryname, + COUNT(*) AS count + FROM devices + INNER JOIN categories + ON devices.category = categories.idcategories + WHERE item_type IS NOT NULL + GROUP BY categoryname, UPPER(item_type)) s JOIN (SELECT TRIM(item_type) AS item_type, - MAX(count) AS maxcount + MAX(count) AS maxcount FROM (SELECT TRIM(item_type) AS item_type, MAX(powered) AS powered, MAX(idcategories) AS idcategories, - categories.name AS categoryname, - COUNT(*) AS count - FROM devices - INNER JOIN categories - ON devices.category = - categories.idcategories - WHERE item_type IS NOT NULL - GROUP BY categoryname, + categories.name AS categoryname, + COUNT(*) AS count + FROM devices + INNER JOIN categories + ON devices.category = + categories.idcategories + WHERE item_type IS NOT NULL + GROUP BY categoryname, UPPER(item_type)) s GROUP BY UPPER(s.item_type)) AS m ON UPPER(s.item_type) = UPPER(m.item_type) - AND s.count = m.maxcount) t + AND s.count = m.maxcount) t GROUP BY UPPER(t.item_type) HAVING LENGTH(item_type) > 0 -")); + ")); + \Cache::put('item_types', $types, 24 * 3600); + } return $types; } diff --git a/app/Helpers/Fixometer.php b/app/Helpers/Fixometer.php index ec3a2d3338..02cffd66e5 100644 --- a/app/Helpers/Fixometer.php +++ b/app/Helpers/Fixometer.php @@ -63,15 +63,6 @@ public static function hasRole($user, $role) return false; } - public static function barChartValue($portion, $total) - { - if ((int) $portion > 0) { - return round((($portion / $total) * 100), 2) - 15; - } - - return -15; - } - public static function featureIsEnabled($feature) { return $feature === true; @@ -188,34 +179,6 @@ public static function userHasDeletePartyPermission($partyId, $userId = null) return false; } - public static function userCanApproveEvent($eventId, $userId = null, $groupId = null) - { - if (is_null($userId)) { - $userId = Auth::user()->id; - } - $user = User::find($userId); - - if (self::hasRole($user, 'Administrator')) { - return true; - } - - if (self::hasRole($user, 'NetworkCoordinator')) { - if ($groupId) { - $group = Group::find($groupId); - } else { - $group = Party::find($eventId)->theGroup; - } - - foreach ($group->networks as $network) { - if ($network->coordinators->contains($user)) { - return true; - } - } - } - - return false; - } - public static function userHasEditEventsDevicesPermission($partyId, $userId = null) { if (is_null($userId)) { diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php index bda453b3c1..fb00eb8663 100644 --- a/app/Http/Controllers/GroupController.php +++ b/app/Http/Controllers/GroupController.php @@ -182,9 +182,6 @@ public function view($groupid) if ((isset($groupid) && is_numeric($groupid)) || in_array($groupid, $gids)) { $group = Group::where('idgroups', $groupid)->first(); - } elseif (count($groups)) { - $group = $groups[0]; - unset($groups[0]); } if (! $group) { @@ -666,15 +663,13 @@ public function getJoinGroup($group_id) } } - // TODO: This is not currently used, so far as I can tell, even though it's referenced from a route. But - // something like this ought to exist, for when we Vue-ify the group edit page. public function imageUpload(Request $request, $id) { try { if (isset($_FILES) && ! empty($_FILES)) { $existing_image = Fixometer::hasImage($id, 'groups', true); if (! empty($existing_image)) { - Fixometer::removeImage($id, env('TBL_GROUPS'), $existing_image[0]); + Fixometer::removeImage($id, 'groups', $existing_image[0]); } $file = new FixometerFile; $file->upload('file', 'image', $id, env('TBL_GROUPS'), false, true, true); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 11bf84074f..4310f5db2e 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -1102,18 +1102,18 @@ public function getUserMenus(Request $request) $items['Users'] = route('users'); $items['Roles'] = route('roles'); $items[Lang::get('networks.general.networks')] = route('networks.index'); + } - if ($user->hasPermission('verify-translation-access')) { - $items['Translations'] = url('/translations/view/admin'); - } + if ($user->hasPermission('verify-translation-access')) { + $items['Translations'] = url('/translations/view/admin'); + } - if ($user->hasRole('NetworkCoordinator')) { - if (count($user()->networks) == 1) { - $network = Auth::user()->networks->first(); - $items[Lang::get('networks.general.particular_network', ['networkName' => $network->name])] = route('networks.show', $network->id); - } else { - $items[Lang::get('networks.general.networks')] = route('networks.index'); - } + if ($user->hasRole('NetworkCoordinator')) { + if (count($user->networks) == 1) { + $network = Auth::user()->networks->first(); + $items[Lang::get('networks.general.particular_network', ['networkName' => $network->name])] = route('networks.show', $network->id); + } else { + $items[Lang::get('networks.general.networks')] = route('networks.index'); } } diff --git a/app/Party.php b/app/Party.php index 88efa85f21..cbe94b955e 100644 --- a/app/Party.php +++ b/app/Party.php @@ -134,49 +134,6 @@ public function deleteUserList($party) return DB::delete(DB::raw('DELETE FROM `events_users` WHERE `event` = :party'), ['party' => $party]); } - public function ofTheseGroups($groups = 'admin', $only_past = false, $devices = false) - { - //Tested - $sql = 'SELECT - *, - `e`.`venue` AS `venue`, `e`.`link` AS `link`, `e`.`location` as `location`, - `g`.`name` AS group_name, - UNIX_TIMESTAMP(e.`event_start_utc`) AS `event_timestamp` - FROM `'.$this->table.'` AS `e` - - INNER JOIN `groups` as `g` ON `e`.`group` = `g`.`idgroups` - - LEFT JOIN ( - SELECT COUNT(`dv`.`iddevices`) AS `device_count`, `dv`.`event` - FROM `devices` AS `dv` - GROUP BY `dv`.`event` - ) AS `d` ON `d`.`event` = `e`.`idevents` '; - if (is_array($groups) && $groups != 'admin') { - $sql .= ' WHERE `e`.`group` IN ('.implode(', ', $groups).') '; - } - - if ($only_past) { - $sql .= ' AND `e`.`event_end_utc` < NOW()'; - } - - $sql .= ' ORDER BY `e`.`event_start_utc` DESC'; - - try { - $parties = DB::select(DB::raw($sql)); - } catch (\Illuminate\Database\QueryException $e) { - dd($e); - } - - if ($devices) { - $devices = new Device; - foreach ($parties as $i => $party) { - $parties[$i]->devices = $devices->ofThisEvent($party->idevents); - } - } - - return $parties; - } - public function ofThisGroup($group = 'admin', $only_past = false, $devices = false) { return self::when($only_past, function ($query) { @@ -392,13 +349,6 @@ public function scopeUpcomingEventsInUserArea($query, $user) ->orderBy('distance', 'ASC'); } - public function scopeRequiresModeration($query) - { - $query = $query->future(); - $query = $query->where('approved', false); - return $query; - } - public function allDevices() { return $this->hasMany(\App\Device::class, 'event', 'idevents')->join('categories', 'categories.idcategories', '=', 'devices.category'); @@ -710,19 +660,6 @@ public function getParticipantsAttribute() return $this->pax; } - public function checkForMissingData() - { - $participants_count = $this->participants; - $volunteers_count = $this->allConfirmedVolunteers->count(); - $devices_count = $this->allDevices->count(); - - return [ - 'participants_count' => $participants_count, - 'volunteers_count' => $volunteers_count, - 'devices_count' => $devices_count, - ]; - } - public function requiresModerationByAdmin() { if ($this->approved) { diff --git a/app/Services/DiscourseService.php b/app/Services/DiscourseService.php index b5f47e97fd..9965a239da 100644 --- a/app/Services/DiscourseService.php +++ b/app/Services/DiscourseService.php @@ -54,44 +54,6 @@ public function getDiscussionTopics($tag = null, $numberOfTopics = 5) return $topics; } - public function getUserIdsByBadge($badgeId) - { - if (! config('restarters.features.discourse_integration')) { - return []; - } - - $externalUserIds = []; - - try { - $client = app('discourse-client'); - - $endpoint = "/user_badges.json?badge_id={$badgeId}"; - $response = $client->request('GET', $endpoint); - if ($response->getStatusCode() == 404) { - Log::error("{$endpoint} not found"); - throw new \Exception("{$endpoint} not found"); - } - $discourseResult = json_decode($response->getBody()); - - $users = $discourseResult->users; - - foreach ($users as $user) { - $endpoint = "/admin/users/{$user->id}.json"; - $response = $client->request('GET', $endpoint); - $discourseResult = json_decode($response->getBody()); - $externalUserIds[] = [ - 'external_id' => $discourseResult->single_sign_on_record->external_id, - 'username' => $discourseResult->single_sign_on_record->external_username, - ]; - $this->avoidRateLimiting(); - } - } catch (\Exception $ex) { - Log::error('Error retrieving users by badge: '.$ex->getMessage()); - } - - return $externalUserIds; - } - protected function avoidRateLimiting() { // Sleep to avoid Discourse rate limiting of 60 requests per minute. @@ -463,9 +425,7 @@ public function syncGroups($idgroups = NULL) { Log::info("Add $discourseMember as admin of {$discourseId} {$discourseName}"); $response = $client->request('PUT', "/admin/groups/$discourseId/owners.json", [ 'form_params' => [ - 'group' => [ - 'usernames' => $discourseMember - ] + 'usernames' => $discourseMember ] ]); diff --git a/app/UsersPermissions.php b/app/UsersPermissions.php index 003ab0d7d4..24286ce212 100644 --- a/app/UsersPermissions.php +++ b/app/UsersPermissions.php @@ -13,4 +13,6 @@ class UsersPermissions extends Model * @var array */ protected $fillable = ['permission_id', 'user_id']; + + public $timestamps = false; } diff --git a/database/factories/CategoryFactory.php b/database/factories/CategoryFactory.php index 87ab5bd2d1..c8721c30c1 100644 --- a/database/factories/CategoryFactory.php +++ b/database/factories/CategoryFactory.php @@ -36,6 +36,7 @@ public function desktopComputer() 'name' => 'Desktop computer', 'revision' => 2, 'aggregate' => 0, + 'cluster' => 1 ]; }); } diff --git a/lang/de/devices.php b/lang/de/devices.php index fa71cbc676..0d1549b645 100644 --- a/lang/de/devices.php +++ b/lang/de/devices.php @@ -3,7 +3,6 @@ return [ 'devices' => 'Devices', 'export_device_data' => 'Export device data', - 'by_date' => 'By date', 'category' => 'Category', 'group' => 'Group', 'from_date' => 'From date', @@ -20,11 +19,8 @@ 'age' => 'Age', 'devices_description' => 'Description of problem/solution', 'delete_device' => 'Delete device', - 'from_manufacturer' => 'From manufacturer', - 'from_third_party' => 'From third party', 'event_info' => 'Event info', 'weight' => 'Weight', 'required_impact' => 'kg - required for environmental impact calculation', 'age_approx' => 'years - approximate, if known', - 'repair_source' => 'Source of repair information', ]; diff --git a/lang/de/events.php b/lang/de/events.php index 6410af39a3..d4fba7af6f 100644 --- a/lang/de/events.php +++ b/lang/de/events.php @@ -13,12 +13,6 @@ 'embed_code_header' => 'Embed code', 'infographic_message' => 'An infographic of an easy-to-understand equivalent of the CO2 emissions that your group has prevented', 'headline_stats_message' => 'This widget shows the headline stats for your event e.g. the number of participants at your parties; the hours volunteered', - 'all_invited_restarters_modal_heading' => 'All invited Restarters', - 'all_invited_restarters_modal_description' => 'An overview of the Restarters invited to your event and their skills.', - 'table_restarter_column' => 'Restarter', - 'table_skills_column' => 'Skills', - 'all_restarters_attended_modal_heading' => 'All Restarters attended', - 'all_restarters_attended_modal_description' => 'An overview of who attended your event and their skills.', 'invite_restarters_modal_heading' => 'Invite volunteers to the event', 'send_invites_to_restarters_tickbox' => 'Add invites for group members. Members marked with a ⚠ will be invited but won\'t be sent an email due to their notification settings.', 'manual_invite_box' => 'Send invites to', @@ -37,8 +31,6 @@ 'option_default' => '-- Select --', 'events' => 'Events', 'event' => 'Event', - 'by_event' => 'By event', - 'by_group' => 'By group', 'create_new_event' => 'Create new event', 'create_event' => 'Create event', 'edit_event' => 'Edit event', @@ -68,7 +60,5 @@ 'field_add_image' => 'Add images', 'before_submit_text' => 'Once confirmed by our community lead, your event will be made public on The Restart Project homepage.', 'save_event' => 'Save Event', - 'reporting' => 'Reporting', - 'download-results' => 'Download Results (CSV)', 'approve_event' => 'Approve Event', ]; diff --git a/lang/de/general.php b/lang/de/general.php index 59cfe48ac2..f69e4bc8f7 100644 --- a/lang/de/general.php +++ b/lang/de/general.php @@ -23,7 +23,6 @@ 'email_alerts_text' => 'Please choose what kind of email updates you would like to receive. You can change these at any time. Our Privacy Policy is available here', 'email_alerts_pref1' => 'I would like to receive The Restart Project monthly newsletter', 'email_alerts_pref2' => 'I would like to receive email notifications about events or groups near me', - 'filter-results' => 'Filter results', 'menu_tools' => 'Community Tools', 'menu_discourse' => 'Discussion', 'menu_wiki' => 'Wiki', @@ -34,6 +33,5 @@ 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'faq_url' => 'https://therestartproject.org/faq', 'restartproject_url' => 'https://therestartproject.org', - 'please_select' => 'Please select', 'calendar_feed_help_url' => '/t/fixometer-how-to-subscribe-to-a-calendar', ]; diff --git a/lang/de/groups.php b/lang/de/groups.php index c8c3bb6b01..a2c868c363 100644 --- a/lang/de/groups.php +++ b/lang/de/groups.php @@ -21,7 +21,6 @@ 'location' => 'Group location', 'groups_approval_text' => 'Group submissions need to be approved by an administrator', 'group_tag' => 'Tag', - 'group_tag2' => 'Group tag', 'group_admin_only' => 'Admin only', 'group_tags' => 'Group tags', 'approve_group' => 'Approve group', diff --git a/lang/de/reporting.php b/lang/de/reporting.php index b211130216..0437b397f2 100644 --- a/lang/de/reporting.php +++ b/lang/de/reporting.php @@ -1,36 +1,11 @@ 'Search time volunteered', - 'by_users' => 'By volunteer', - 'by_location' => 'By location', - 'age_range' => 'Age range', - 'gender' => 'Gender', - 'placeholder_name' => 'Search name', - 'placeholder_gender_text' => 'Search gender', - 'placeholder_age_range' => 'Choose age range', - 'placeholder_group' => 'Choose group', - 'placeholder_gender' => 'Choose gender', - 'miscellaneous' => 'Miscellaneous', - 'include_anonymous_users' => 'Include anonymous users', - 'yes' => 'Yes', - 'no' => 'No', - 'country' => 'Country', - 'average_age' => 'Average age', - 'number_of_groups' => 'Number of groups', - 'total_number_of_users' => 'Total number of users', - 'number_of_anonymous_users' => 'Number of anonymous users', 'breakdown_by_country' => 'Breakdown by country', 'breakdown_by_city' => 'Breakdown by city', 'breakdown_by_country_content' => 'Volunteer hours grouped by volunteer country.', 'breakdown_by_city_content' => 'Volunteer hours grouped by the volunteer town/city (note: town/country is optional so may not be set for all volunteers).', - 'see_all_results' => 'See all results', 'total_hours' => 'Total hours', 'country_name' => 'Country name', 'town_city_name' => 'Town/city name', - 'restarter_name' => 'Restarter', - 'hours' => 'Hours', - 'event_date' => 'Event date', - 'event_name' => 'Event', - 'restart_group' => 'Group', ]; diff --git a/lang/en/admin.php b/lang/en/admin.php index 7cd2f8acda..b6c33b1c27 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -11,7 +11,6 @@ 'create-new-skill' => 'Create new skill', 'create-new-tag' => 'Create new tag', 'create-new-brand' => 'Create new brand', - 'name' => 'Name', 'skills_modal_title' => 'Add new skill', 'tags_modal_title' => 'Add new tag', 'brand_modal_title' => 'Add new brand', diff --git a/lang/en/devices.php b/lang/en/devices.php index d2612c72d6..a0738d7f20 100644 --- a/lang/en/devices.php +++ b/lang/en/devices.php @@ -5,7 +5,6 @@ 'export_device_data' => 'Download all data', 'export_event_data' => 'Download event data', 'export_group_data' => 'Download repair data', - 'by_date' => 'By date', 'category' => 'Category', 'group' => 'Group', 'from_date' => 'From date', @@ -24,8 +23,6 @@ 'age' => 'Age', 'devices_description' => 'Description of problem/solution', 'delete_device' => 'Delete device', - 'from_manufacturer' => 'From manufacturer', - 'from_third_party' => 'From third party', 'devices_date' => 'Date', 'event_info' => 'Event info', 'fixometer' => 'Fixometer', @@ -48,7 +45,6 @@ 'required_impact' => 'kg - required to calculate environmental impact', 'optional_impact' => 'kg - used to refine environmental impact calculation (optional)', 'age_approx' => 'years (approximate if unknown)', - 'repair_source' => 'Source of repair information', 'tooltip_category' => 'Choose the category that best fits this item. More information about these categories...', 'tooltip_model' => 'Add as much information about the specific model of device here as you can (e.g. \'Galaxy S10 5G\'). Leave empty if you don\'t know the model.', 'tooltip_problem' => '

Please provide as much detail as you can about the problem with the device and what was done to repair it. For example:

More information

', diff --git a/lang/en/events.php b/lang/en/events.php index e38e061cf5..98612dd44a 100644 --- a/lang/en/events.php +++ b/lang/en/events.php @@ -32,12 +32,6 @@ 'embed_code_header' => 'Embed code', 'infographic_message' => 'An infographic of an easy-to-understand equivalent of the CO2 emissions that your group has prevented', 'headline_stats_message' => 'This widget shows the headline stats for your event e.g. the number of participants at your parties; the hours volunteered', - 'all_invited_restarters_modal_heading' => 'All invited volunteers', - 'all_invited_restarters_modal_description' => 'An overview of the volunteers invited to your event and their skills.', - 'table_restarter_column' => 'Repairer', - 'table_skills_column' => 'Skills', - 'all_restarters_attended_modal_heading' => 'All volunteers attended', - 'all_restarters_attended_modal_description' => 'An overview of who attended your event and their skills.', 'invite_restarters_modal_heading' => 'Invite volunteers', 'shareable_link' => 'Invite via shareable link', 'email_invite' => 'Invite via email', @@ -57,8 +51,6 @@ 'option_default' => '-- Select --', 'events' => 'Events', 'event' => 'Event', - 'by_event' => 'By event', - 'by_group' => 'By group', 'create_new_event' => 'Create new event', 'edit_event' => 'Edit event', 'edit_event_content' => 'You can keep your event details up-to-date here.', @@ -73,8 +65,6 @@ 'field_event_venue' => 'Venue address', 'field_add_image' => 'Add images', 'before_submit_text' => 'Once confirmed by a coordinator, your event will be made public.', - 'reporting' => 'Event Reporting', - 'download-results' => 'Download Results (CSV)', 'follow_hosting_group' => 'This event is being hosted by :group. Would you like to follow them?', 'request_review_message' => '

This will notify volunteers who attended this event that repair data has been added and that it could benefit from additional contributions and review.

It will also let volunteers know that photos (including of visitor book feedback) may have been posted.

Do you wish to send these notifications?

', 'request_review_modal_heading' => 'Request review', @@ -85,7 +75,6 @@ 'no_upcoming_for_your_groups' => 'There are currently no upcoming events for your groups', 'youre_going' => 'You\'re going!', 'online_event_question' => 'Online event?', - 'all_restarters_confirmed_modal_heading' => 'All volunteers confirmed', 'organised_by' => 'Organised by :group', 'event_actions' => 'Event actions', 'request_review' => 'Request review', @@ -110,7 +99,6 @@

For misc items, we apply a generic CO2e to weight ratio to estimate the impact of each successful repair.

Learn more about how we calculate impact here

', 'delete_event' => 'Delete event', - 'see_all' => 'See all', 'confirmed_none' => 'There are no confirmed volunteers.', 'invited_none' => 'There are no invited volunteers yet.', 'view_map' => 'View map', @@ -149,7 +137,6 @@ 'discourse_intro' => "This is a private discussion for those volunteering at the :name event being held by :groupname on :start to :end.\r\n\r\nWe can use this thread in advance of the event to discuss logistics, and afterwards to discuss the repairs that we did.\r\n\r\n(This is an automated message.)", 'invite_invalid_emails' => 'Invalid emails were entered, so no notifications were sent - please send your invitation again. The invalid emails were: :emails', 'invite_success' => 'Invites sent!', - 'invite_success_apart_from' => 'Invites Sent - apart from these (:emails) who were already part of the event.', 'invite_noemails' => 'You have not entered any emails!', 'invite_invalid' => 'Something went wrong - this invite is invalid or has expired', 'invite_cancelled' => 'You are no longer attending this event.', diff --git a/lang/en/general.php b/lang/en/general.php index 94c810ce2d..634d1b07ea 100644 --- a/lang/en/general.php +++ b/lang/en/general.php @@ -28,13 +28,11 @@ 'save_repair_skills' => 'Save skills', 'email_alerts' => 'Emails & alerts', 'email_alerts_text' => 'Please choose what kind of email updates you would like to receive. You can change these at any time. Our Privacy Policy is available here', - 'filter-results' => 'Filter results', 'menu_discourse' => 'Talk', 'menu_wiki' => 'Wiki', 'menu_help_feedback' => 'Help & Feedback', 'menu_faq' => 'FAQs', 'therestartproject' => 'The Restart Project', - 'please_select' => 'Please select', 'calendar_feed_help_url' => '/t/fixometer-how-to-subscribe-to-a-calendar', 'menu_fixometer' => 'Fixometer', 'menu_events' => 'Events', diff --git a/lang/en/groups.php b/lang/en/groups.php index b700f96e75..9767dafa55 100644 --- a/lang/en/groups.php +++ b/lang/en/groups.php @@ -28,7 +28,6 @@ 'area' => 'Area', 'groups_approval_text' => 'Group submissions need to be approved by an administrator', 'group_tag' => 'Tag', - 'group_tag2' => 'Group tag', 'group_tags' => 'Group tags', 'approve_group' => 'Approve group', 'invite_group_header_link' => 'Invite volunteers', diff --git a/lang/en/reporting.php b/lang/en/reporting.php index 972d735131..61cf1adea9 100644 --- a/lang/en/reporting.php +++ b/lang/en/reporting.php @@ -1,37 +1,11 @@ 'Search name', - 'placeholder_gender_text' => 'Search gender', - 'search-all-time-volunteered' => 'Search time volunteered', - 'by_users' => 'By volunteer', - 'by_location' => 'By location', - 'age_range' => 'Age range', - 'gender' => 'Gender', - 'placeholder_age_range' => 'Choose age range', - 'placeholder_group' => 'Choose group', - 'placeholder_gender' => 'Choose gender', - 'miscellaneous' => 'Miscellaneous', - 'include_anonymous_users' => 'Include anonymous users', - 'yes' => 'Yes', - 'no' => 'No', - 'country' => 'Country', - 'hours_volunteered' => 'Hours volunteered', - 'average_age' => 'Average age', - 'number_of_groups' => 'Number of groups', - 'total_number_of_users' => 'Total number of users', - 'number_of_anonymous_users' => 'Number of anonymous users', 'breakdown_by_country' => 'Breakdown by country', 'breakdown_by_city' => 'Breakdown by city', 'breakdown_by_country_content' => 'Volunteer hours grouped by volunteer country.', 'breakdown_by_city_content' => 'Volunteer hours grouped by the volunteer town/city (note: town/country is optional so may not be set for all volunteers).', - 'see_all_results' => 'See all results', - 'total_hours' => 'Total hours', 'country_name' => 'Country name', 'town_city_name' => 'Town/city name', - 'restarter_name' => 'Volunteer', - 'hours' => 'Hours', - 'event_date' => 'Event date', - 'event_name' => 'Event', - 'restart_group' => 'Group', + 'total_hours' => 'Total hours', ]; diff --git a/lang/fr-BE/devices.php b/lang/fr-BE/devices.php index da12d52f2f..5798fdc0fa 100644 --- a/lang/fr-BE/devices.php +++ b/lang/fr-BE/devices.php @@ -5,7 +5,6 @@ 'export_device_data' => 'Exporter les données des appareils', 'export_event_data' => 'Exporter les données de l\'événement', 'export_group_data' => 'Exporter les données du Repair Café', - 'by_date' => 'Par date', 'category' => 'Catégorie', 'group' => 'Repair Café', 'from_date' => 'Entre le', @@ -24,8 +23,6 @@ 'age' => 'Âge', 'devices_description' => 'Description du problème/solution', 'delete_device' => 'Effacer l\'appareil', - 'from_manufacturer' => 'Du fabricant', - 'from_third_party' => 'D\'un tierce', 'event_info' => 'Informations sur l\'événement', 'devices_date' => 'Date', 'add_data_action_button' => 'Participer à l\'événément', @@ -47,7 +44,6 @@ 'placeholder_notes' => 'Notes. Ex: difficultés de réparation, perception du problème par le propriétaire etc.', 'powered_items' => 'Appareils électriques', 'repair_outcome' => 'Résultat de la réparation?', - 'repair_source' => 'Source d\'information de la réparation', 'required_impact' => 'kg - nécessaire pour calculer l\'impact sur l\'environnement', 'optional_impact' => 'kg - utilisé pour affiner le calcul de l\'impact environnemental (facultatif)', 'title_assessment' => 'Evaluation', diff --git a/lang/fr-BE/events.php b/lang/fr-BE/events.php index 7e25513bc3..33443ae29c 100644 --- a/lang/fr-BE/events.php +++ b/lang/fr-BE/events.php @@ -13,12 +13,6 @@ 'embed_code_header' => 'Intégrer code', 'infographic_message' => 'Une infographie facile à comprendre de l\'équivalent d\'émissions de CO2 que votre repair café a empêché, comme par exemple l\'équivalent du nombre de voiture fabriquées', 'headline_stats_message' => 'Ce widget montre l\'indice statistique de votre événement ex: le nombre de participants, le nombre d\'heures de bénévolat', - 'all_invited_restarters_modal_heading' => 'Tous les bénévoles invités', - 'all_invited_restarters_modal_description' => 'Un aperçu des bénévoles invités à votre événement et leurs compétences', - 'table_restarter_column' => 'Bénévole', - 'table_skills_column' => 'Compétences', - 'all_restarters_attended_modal_heading' => 'Tous les bénévoles ayant participé', - 'all_restarters_attended_modal_description' => 'Un aperçu de qui a participé à votre événement et leurs compétences', 'invite_restarters_modal_heading' => 'Invitez les bénévoles à l\'événement', 'send_invites_to_restarters_tickbox' => 'Ajouter les invitations pour les membres. Les membres marqués avec un ⚠ seront invités mais ne recevront pas un e-mail en raison de leurs paramètres de notifications', 'manual_invite_box' => 'Envoyez les invitations à', @@ -37,8 +31,6 @@ 'option_default' => '-- Sélectionner --', 'events' => 'Evénements', 'event' => 'Evénement', - 'by_event' => 'Par événement', - 'by_group' => 'Par Repair Café', 'create_new_event' => 'Créer un nouvel événement', 'create_event' => 'Créer événement', 'edit_event' => 'Editer événement', @@ -68,8 +60,6 @@ 'field_add_image' => 'Ajoutez une image', 'before_submit_text' => 'Une fois confirmé par le responsable du réseau, votre événement sera rendu public sur la page d\'accueil du Restart Project.', 'save_event' => 'Sauver l\'événement', - 'reporting' => 'Signaler', - 'download-results' => 'Télécharger résultats (CSV)', 'approve_event' => 'Approuver l\'événement', 'cancel_invites_link' => 'Annuler invitation', 'cancel_requests' => 'Annuler demandes', @@ -86,7 +76,6 @@ 'online_event_question' => 'Visioconférence?', 'youre_going' => 'Vous participez!', 'add_new_event' => 'Ajouter nouvel événement', - 'all_restarters_confirmed_modal_heading' => 'Tous les bénévoles confirmés', 'confirmed' => 'Confirmé(s)', 'created_success_message' => 'Evénement créé! Il sera approuvé par un administrateur dans les plus brefs délais. Vous pouvez cependant continuer à l\'éditer en attendant.', 'editing' => 'Edition :event', @@ -117,7 +106,6 @@ 'read_less' => ' LIRE MOINS', 'read_more' => 'LIRE PLUS ', 'RSVP' => 'Participer', - 'see_all' => 'Voir tout', 'view_map' => 'Voir la carte', 'form_error' => 'Veuillez vérifier que le formulaire ci-dessus ne contient pas d\'erreurs.', 'your_events' => 'Vos événements', @@ -146,7 +134,6 @@ 'discourse_intro' => "Bonjour, il s’agit d’une conversation privée pour les personnes qui se sont portées volontaires pour l’événement :name organisé par :groupname le :start à :end.\r\n\r\nNous pouvons utiliser ce fil de discussion avant l’événement pour discuter de la logistique, et après pour discuter des réparations que nous avons effectuées.\r\n\r\n(Ceci est un message automatique.)", 'invite_invalid_emails' => 'Des emails non valides ont été saisis, donc aucune notification n\'a été envoyée - veuillez envoyer votre invitation à nouveau. Les emails non valides étaient : :emails', 'invite_success' => 'Les invitations sont envoyées!', - 'invite_success_apart_from' => 'Invitations envoyées - en dehors de ces (:emails) qui faisaient déjà partie de l\'événement.', 'invite_noemails' => 'Vous n\'avez pas saisi d\'emails!', 'invite_invalid' => 'Un problème est survenu - cette invitation n\'est pas valide ou a expiré.', 'invite_cancelled' => 'Vous ne participez plus à cet évènement.', diff --git a/lang/fr-BE/general.php b/lang/fr-BE/general.php index e9c053f276..9cdd68c7dd 100644 --- a/lang/fr-BE/general.php +++ b/lang/fr-BE/general.php @@ -23,7 +23,6 @@ 'email_alerts_text' => 'Veuillez choisir le type de mise à jour par courriel que vous aimeriez recevoir. Vous pouvez les changer à tout moment. Notre politique de confidentialité est disponible ici', 'email_alerts_pref1' => 'Je souhaite recevoir le bulletin mensuel The Restart Project', 'email_alerts_pref2' => 'Je souhaite recevoir des notifications par e-mail sur des événements ou des Repair Cafés proches de chez moi', - 'filter-results' => 'Résultats du filtre', 'menu_tools' => 'Outils pour la communauté', 'menu_discourse' => 'Forum', 'menu_wiki' => 'Wiki', @@ -34,7 +33,6 @@ 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'faq_url' => 'https://therestartproject.org/faq', 'restartproject_url' => 'https://therestartproject.org', - 'please_select' => 'Veuillez sélectionner', 'calendar_feed_help_url' => '/t/fixometer-how-to-subscribe-to-a-calendar', 'menu_fixometer' => 'Fixometer', 'menu_events' => 'Événements', diff --git a/lang/fr-BE/groups.php b/lang/fr-BE/groups.php index 1235edab76..6698325add 100644 --- a/lang/fr-BE/groups.php +++ b/lang/fr-BE/groups.php @@ -23,7 +23,6 @@ 'location' => 'Localisation du Repair Café', 'groups_approval_text' => 'L\'ajout de repair cafés doit être approuvé par un administrateur', 'group_tag' => 'Etiquette', - 'group_tag2' => 'Etiquette du Repair Café', 'group_admin_only' => 'Seulement administrateur', 'group_tags' => 'Etiquettes du Repair Café', 'approve_group' => 'Approuver Repair Café', diff --git a/lang/fr-BE/reporting.php b/lang/fr-BE/reporting.php index 0194a086f1..fdd49afcf2 100644 --- a/lang/fr-BE/reporting.php +++ b/lang/fr-BE/reporting.php @@ -1,37 +1,11 @@ 'Chercher les heures de bénévolat prestées', - 'by_users' => 'Par bénévole', - 'by_location' => 'Par lieu', - 'age_range' => 'Tranche d\'âge', - 'gender' => 'Genre', - 'placeholder_name' => 'Chercher nom', - 'placeholder_gender_text' => 'Cherchez le genre', - 'placeholder_age_range' => 'Choisissez la tranche d\'âge', - 'placeholder_group' => 'Choisissez repair café', - 'placeholder_gender' => 'Choisissez le genre', - 'miscellaneous' => 'Divers', - 'include_anonymous_users' => 'Utilisateurs anonymes inclus', - 'yes' => 'Oui', - 'no' => 'Non', - 'country' => 'Pays', - 'hours_volunteered' => 'Heures de bénévolat', - 'average_age' => 'Moyenne d\'âge', - 'number_of_groups' => 'Nombre de Repair Cafés', - 'total_number_of_users' => 'Nombre total d\'utilisateurs', - 'number_of_anonymous_users' => 'Nombre d\'utilisateurs anonymes', 'breakdown_by_country' => 'Répartition par pays', 'breakdown_by_city' => 'Répartition par ville', 'breakdown_by_country_content' => 'Heures de bénévolat groupées par pays des bénvoles', 'breakdown_by_city_content' => 'Nombre d\'heures de bénévolat groupées par ville de bénévole (note: la ville et la nationalité sont optionnels, et ne seront donc pas visible pour tous les bénévoles)', - 'see_all_results' => 'Voir tous les résultats', 'total_hours' => 'Total des heures', 'country_name' => 'Nom du pays', 'town_city_name' => 'Nom de la ville', - 'restarter_name' => 'Réparateur bénévole', - 'hours' => 'Heures', - 'event_date' => 'Date de l\'événement', - 'event_name' => 'Evénement', - 'restart_group' => 'Repair Café', ]; diff --git a/lang/fr/devices.php b/lang/fr/devices.php index da12d52f2f..5798fdc0fa 100644 --- a/lang/fr/devices.php +++ b/lang/fr/devices.php @@ -5,7 +5,6 @@ 'export_device_data' => 'Exporter les données des appareils', 'export_event_data' => 'Exporter les données de l\'événement', 'export_group_data' => 'Exporter les données du Repair Café', - 'by_date' => 'Par date', 'category' => 'Catégorie', 'group' => 'Repair Café', 'from_date' => 'Entre le', @@ -24,8 +23,6 @@ 'age' => 'Âge', 'devices_description' => 'Description du problème/solution', 'delete_device' => 'Effacer l\'appareil', - 'from_manufacturer' => 'Du fabricant', - 'from_third_party' => 'D\'un tierce', 'event_info' => 'Informations sur l\'événement', 'devices_date' => 'Date', 'add_data_action_button' => 'Participer à l\'événément', @@ -47,7 +44,6 @@ 'placeholder_notes' => 'Notes. Ex: difficultés de réparation, perception du problème par le propriétaire etc.', 'powered_items' => 'Appareils électriques', 'repair_outcome' => 'Résultat de la réparation?', - 'repair_source' => 'Source d\'information de la réparation', 'required_impact' => 'kg - nécessaire pour calculer l\'impact sur l\'environnement', 'optional_impact' => 'kg - utilisé pour affiner le calcul de l\'impact environnemental (facultatif)', 'title_assessment' => 'Evaluation', diff --git a/lang/fr/events.php b/lang/fr/events.php index 7e25513bc3..33443ae29c 100644 --- a/lang/fr/events.php +++ b/lang/fr/events.php @@ -13,12 +13,6 @@ 'embed_code_header' => 'Intégrer code', 'infographic_message' => 'Une infographie facile à comprendre de l\'équivalent d\'émissions de CO2 que votre repair café a empêché, comme par exemple l\'équivalent du nombre de voiture fabriquées', 'headline_stats_message' => 'Ce widget montre l\'indice statistique de votre événement ex: le nombre de participants, le nombre d\'heures de bénévolat', - 'all_invited_restarters_modal_heading' => 'Tous les bénévoles invités', - 'all_invited_restarters_modal_description' => 'Un aperçu des bénévoles invités à votre événement et leurs compétences', - 'table_restarter_column' => 'Bénévole', - 'table_skills_column' => 'Compétences', - 'all_restarters_attended_modal_heading' => 'Tous les bénévoles ayant participé', - 'all_restarters_attended_modal_description' => 'Un aperçu de qui a participé à votre événement et leurs compétences', 'invite_restarters_modal_heading' => 'Invitez les bénévoles à l\'événement', 'send_invites_to_restarters_tickbox' => 'Ajouter les invitations pour les membres. Les membres marqués avec un ⚠ seront invités mais ne recevront pas un e-mail en raison de leurs paramètres de notifications', 'manual_invite_box' => 'Envoyez les invitations à', @@ -37,8 +31,6 @@ 'option_default' => '-- Sélectionner --', 'events' => 'Evénements', 'event' => 'Evénement', - 'by_event' => 'Par événement', - 'by_group' => 'Par Repair Café', 'create_new_event' => 'Créer un nouvel événement', 'create_event' => 'Créer événement', 'edit_event' => 'Editer événement', @@ -68,8 +60,6 @@ 'field_add_image' => 'Ajoutez une image', 'before_submit_text' => 'Une fois confirmé par le responsable du réseau, votre événement sera rendu public sur la page d\'accueil du Restart Project.', 'save_event' => 'Sauver l\'événement', - 'reporting' => 'Signaler', - 'download-results' => 'Télécharger résultats (CSV)', 'approve_event' => 'Approuver l\'événement', 'cancel_invites_link' => 'Annuler invitation', 'cancel_requests' => 'Annuler demandes', @@ -86,7 +76,6 @@ 'online_event_question' => 'Visioconférence?', 'youre_going' => 'Vous participez!', 'add_new_event' => 'Ajouter nouvel événement', - 'all_restarters_confirmed_modal_heading' => 'Tous les bénévoles confirmés', 'confirmed' => 'Confirmé(s)', 'created_success_message' => 'Evénement créé! Il sera approuvé par un administrateur dans les plus brefs délais. Vous pouvez cependant continuer à l\'éditer en attendant.', 'editing' => 'Edition :event', @@ -117,7 +106,6 @@ 'read_less' => ' LIRE MOINS', 'read_more' => 'LIRE PLUS ', 'RSVP' => 'Participer', - 'see_all' => 'Voir tout', 'view_map' => 'Voir la carte', 'form_error' => 'Veuillez vérifier que le formulaire ci-dessus ne contient pas d\'erreurs.', 'your_events' => 'Vos événements', @@ -146,7 +134,6 @@ 'discourse_intro' => "Bonjour, il s’agit d’une conversation privée pour les personnes qui se sont portées volontaires pour l’événement :name organisé par :groupname le :start à :end.\r\n\r\nNous pouvons utiliser ce fil de discussion avant l’événement pour discuter de la logistique, et après pour discuter des réparations que nous avons effectuées.\r\n\r\n(Ceci est un message automatique.)", 'invite_invalid_emails' => 'Des emails non valides ont été saisis, donc aucune notification n\'a été envoyée - veuillez envoyer votre invitation à nouveau. Les emails non valides étaient : :emails', 'invite_success' => 'Les invitations sont envoyées!', - 'invite_success_apart_from' => 'Invitations envoyées - en dehors de ces (:emails) qui faisaient déjà partie de l\'événement.', 'invite_noemails' => 'Vous n\'avez pas saisi d\'emails!', 'invite_invalid' => 'Un problème est survenu - cette invitation n\'est pas valide ou a expiré.', 'invite_cancelled' => 'Vous ne participez plus à cet évènement.', diff --git a/lang/fr/general.php b/lang/fr/general.php index e9c053f276..9cdd68c7dd 100644 --- a/lang/fr/general.php +++ b/lang/fr/general.php @@ -23,7 +23,6 @@ 'email_alerts_text' => 'Veuillez choisir le type de mise à jour par courriel que vous aimeriez recevoir. Vous pouvez les changer à tout moment. Notre politique de confidentialité est disponible ici', 'email_alerts_pref1' => 'Je souhaite recevoir le bulletin mensuel The Restart Project', 'email_alerts_pref2' => 'Je souhaite recevoir des notifications par e-mail sur des événements ou des Repair Cafés proches de chez moi', - 'filter-results' => 'Résultats du filtre', 'menu_tools' => 'Outils pour la communauté', 'menu_discourse' => 'Forum', 'menu_wiki' => 'Wiki', @@ -34,7 +33,6 @@ 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'faq_url' => 'https://therestartproject.org/faq', 'restartproject_url' => 'https://therestartproject.org', - 'please_select' => 'Veuillez sélectionner', 'calendar_feed_help_url' => '/t/fixometer-how-to-subscribe-to-a-calendar', 'menu_fixometer' => 'Fixometer', 'menu_events' => 'Événements', diff --git a/lang/fr/groups.php b/lang/fr/groups.php index 313dc95ff6..e3992cac67 100644 --- a/lang/fr/groups.php +++ b/lang/fr/groups.php @@ -23,7 +23,6 @@ 'location' => 'Localisation du Repair Café', 'groups_approval_text' => 'L\'ajout de repair cafés doit être approuvé par un administrateur', 'group_tag' => 'Etiquette', - 'group_tag2' => 'Etiquette du Repair Café', 'group_admin_only' => 'Seulement administrateur', 'group_tags' => 'Etiquettes du Repair Café', 'approve_group' => 'Approuver Repair Café', diff --git a/lang/fr/reporting.php b/lang/fr/reporting.php index 0194a086f1..fdd49afcf2 100644 --- a/lang/fr/reporting.php +++ b/lang/fr/reporting.php @@ -1,37 +1,11 @@ 'Chercher les heures de bénévolat prestées', - 'by_users' => 'Par bénévole', - 'by_location' => 'Par lieu', - 'age_range' => 'Tranche d\'âge', - 'gender' => 'Genre', - 'placeholder_name' => 'Chercher nom', - 'placeholder_gender_text' => 'Cherchez le genre', - 'placeholder_age_range' => 'Choisissez la tranche d\'âge', - 'placeholder_group' => 'Choisissez repair café', - 'placeholder_gender' => 'Choisissez le genre', - 'miscellaneous' => 'Divers', - 'include_anonymous_users' => 'Utilisateurs anonymes inclus', - 'yes' => 'Oui', - 'no' => 'Non', - 'country' => 'Pays', - 'hours_volunteered' => 'Heures de bénévolat', - 'average_age' => 'Moyenne d\'âge', - 'number_of_groups' => 'Nombre de Repair Cafés', - 'total_number_of_users' => 'Nombre total d\'utilisateurs', - 'number_of_anonymous_users' => 'Nombre d\'utilisateurs anonymes', 'breakdown_by_country' => 'Répartition par pays', 'breakdown_by_city' => 'Répartition par ville', 'breakdown_by_country_content' => 'Heures de bénévolat groupées par pays des bénvoles', 'breakdown_by_city_content' => 'Nombre d\'heures de bénévolat groupées par ville de bénévole (note: la ville et la nationalité sont optionnels, et ne seront donc pas visible pour tous les bénévoles)', - 'see_all_results' => 'Voir tous les résultats', 'total_hours' => 'Total des heures', 'country_name' => 'Nom du pays', 'town_city_name' => 'Nom de la ville', - 'restarter_name' => 'Réparateur bénévole', - 'hours' => 'Heures', - 'event_date' => 'Date de l\'événement', - 'event_name' => 'Evénement', - 'restart_group' => 'Repair Café', ]; diff --git a/lang/it/devices.php b/lang/it/devices.php index 18a1307047..c0fd3b7108 100644 --- a/lang/it/devices.php +++ b/lang/it/devices.php @@ -3,7 +3,6 @@ return [ 'devices' => 'Dispositivo', 'export_device_data' => 'Esporta dati del dispositivo', - 'by_date' => 'Fino a/Scadenza', 'category' => 'Categoria', 'group' => 'Gruppo', 'from_date' => 'Dalla data', @@ -20,12 +19,9 @@ 'age' => 'Eta\'', 'devices_description' => 'Descrizione del problema o della soluzione', 'delete_device' => 'Cancella dispositivo', - 'from_manufacturer' => 'Dal produttore', - 'from_third_party' => 'Da parti terze', 'event_info' => 'Informazioni evento', 'devices_date' => 'Data', 'weight' => 'Peso', 'required_impact' => 'kg - required for environmental impact calculation', 'age_approx' => 'years - approximate, if known', - 'repair_source' => 'Source of repair information', ]; diff --git a/lang/it/events.php b/lang/it/events.php index 058534e157..15f8bd8f59 100644 --- a/lang/it/events.php +++ b/lang/it/events.php @@ -13,12 +13,6 @@ 'embed_code_header' => 'Codice incorporato', 'infographic_message' => 'Un\'immagine smeplice di un equivalente delle emissioni di CO 2 che il tuo gruppo ha prevenuto, equivalente a numero di auto prodotte', 'headline_stats_message' => 'Questo widget mostra le statistiche essenziali del tuo evento, ad es. il numero di partecipanti e le ore di volontariato', - 'all_invited_restarters_modal_heading' => 'Tutti i Restarters invitati', - 'all_invited_restarters_modal_description' => 'Una panoramica dei Restarter invitati al tuo evento e le loro competenze.', - 'table_restarter_column' => 'Restarter', - 'table_skills_column' => 'Abilita\'', - 'all_restarters_attended_modal_heading' => 'Tutti i Restarters presenti', - 'all_restarters_attended_modal_description' => 'Una panoramica di chi ha partecipato al tuo evento e le loro competenze.', 'invite_restarters_modal_heading' => 'Invita volontari all\'evento.', 'send_invites_to_restarters_tickbox' => 'Aggiungi inviti per i membri del gruppo. I membri contrassegnati con un ⚠ saranno invitati ma non riceveranno un\'e-mail a causa delle loro impostazioni di notifica.', 'manual_invite_box' => 'Spedisici invito a', @@ -37,8 +31,6 @@ 'option_default' => '-- Seleziona --', 'events' => 'Eventi', 'event' => 'Evento', - 'by_event' => 'Per evento', - 'by_group' => 'Per gruppo', 'create_new_event' => 'Crea nuovo evento', 'create_event' => 'Crea evento', 'edit_event' => 'Modifica evento', @@ -68,8 +60,6 @@ 'field_add_image' => 'Inserisci immagine', 'before_submit_text' => 'Una volta confermato dal responsabile, il vostro evento sarà reso pubblico sulla homepage del Restart Project.', 'save_event' => 'Memorizza Evento', - 'reporting' => 'Rapporto', - 'download-results' => 'Scarica risultati (CSV)', 'approve_event' => 'Evento approvato', 'cancel_invites_link' => 'Annulla inviti', 'cancel_requests' => 'Annulla richiesta', diff --git a/lang/it/general.php b/lang/it/general.php index f4fc8d3e95..ab5c8cc85f 100644 --- a/lang/it/general.php +++ b/lang/it/general.php @@ -23,7 +23,6 @@ 'email_alerts_text' => 'Scegli quale tipo di aggiornamenti e-mail desideri ricevere. Puoi cambiarli in qualsiasi momento. La nostra politica sulla privacy è disponibile qui ', 'email_alerts_pref1' => 'Vorrei ricevere la newsletter mensile del Restart Project', 'email_alerts_pref2' => 'Vorrei ricevere notifiche e-mail su eventi o gruppi vicino a me', - 'filter-results' => 'Risultato del filtro', 'menu_tools' => 'Strumenti per la comunità', 'menu_discourse' => 'Discussione', 'menu_wiki' => 'Wiki', @@ -34,6 +33,5 @@ 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'faq_url' => 'https://therestartproject.org/faq', 'restartproject_url' => 'https://therestartproject.org', - 'please_select' => 'Seleziona per favore', 'calendar_feed_help_url' => '/t/fixometer-how-to-subscribe-to-a-calendar', ]; diff --git a/lang/it/groups.php b/lang/it/groups.php index c88decedb4..45f26b72c9 100644 --- a/lang/it/groups.php +++ b/lang/it/groups.php @@ -21,7 +21,6 @@ 'location' => 'Sede del gruppo', 'groups_approval_text' => 'Le presentazioni dei gruppi devono essere approvate da un amministratore', 'group_tag' => 'Etichetta', - 'group_tag2' => 'Etichetta del gruppo', 'group_admin_only' => 'Solo per Admin', 'group_tags' => 'Etichette del gruppo', 'approve_group' => 'Approva il gruppo', diff --git a/lang/it/reporting.php b/lang/it/reporting.php index 0ccc14fee8..718869e774 100644 --- a/lang/it/reporting.php +++ b/lang/it/reporting.php @@ -1,36 +1,11 @@ 'Cerca ore di volontariato', - 'by_users' => 'Per volontatio', - 'by_location' => 'Per luogo', - 'age_range' => 'Fascia d\'età', - 'gender' => 'Sesso', - 'placeholder_name' => 'Cerca nome', - 'placeholder_gender_text' => 'Cerca genere (sesso)', - 'placeholder_age_range' => 'Scegli intervallo di eta\'', - 'placeholder_group' => 'Scegli gruppo', - 'placeholder_gender' => 'Scegli sesso', - 'miscellaneous' => 'Miscellanea', - 'include_anonymous_users' => 'Includi utenti anonimi', - 'yes' => 'Si', - 'no' => 'No', - 'country' => 'Nazione', - 'average_age' => 'Età media', - 'number_of_groups' => 'Numero di gruppi', - 'total_number_of_users' => 'Numero totale di utenti', - 'number_of_anonymous_users' => 'Numero di utenti anonimi', 'breakdown_by_country' => 'Suddivisione per nazione.', 'breakdown_by_city' => 'Suddivisione per città', 'breakdown_by_country_content' => 'Ore di volontariato raggruppate per paese di volontariato.', 'breakdown_by_city_content' => 'Ore di volontariato raggruppate per paese/città (nota: la città e la nazione sono facoltativi, pertanto potrebbe non essere impostati per tutti i volontari).', - 'see_all_results' => 'Vedi tutti i risultati', 'total_hours' => 'Ore totali', 'country_name' => 'Nome della nazione', 'town_city_name' => 'Nome del paese/citta\'', - 'restarter_name' => 'Restarter', - 'hours' => 'Ore', - 'event_date' => 'Data evento', - 'event_name' => 'Evento', - 'restart_group' => 'Gruppo', ]; diff --git a/lang/ne/devices.php b/lang/ne/devices.php index cfae391b45..1e45d76bfb 100644 --- a/lang/ne/devices.php +++ b/lang/ne/devices.php @@ -1,7 +1,6 @@ 'Op datum', 'age' => 'Leeftijd', 'brand' => 'Merk', 'category' => 'Categorie', @@ -11,8 +10,6 @@ 'export_device_data' => 'Exporteer de gegevens van de toestellen', 'fixed' => 'Hersteld', 'from_date' => 'Vanaf', - 'from_manufacturer' => 'Van producent', - 'from_third_party' => 'Van derde partij', 'graphic-camera' => 'Camera', 'graphic-comment' => 'Commentaar', 'group' => 'Groep', diff --git a/lang/ne/events.php b/lang/ne/events.php index 7ee4bf1056..bd353525e5 100644 --- a/lang/ne/events.php +++ b/lang/ne/events.php @@ -5,18 +5,11 @@ 'about_event_name_header' => 'Over :event', 'add_event' => 'Activiteit toevoegen', 'add_volunteer_modal_heading' => 'Vrijwilliger toevoegen', - 'all_invited_restarters_modal_description' => 'Overzicht van de Restarters die je uitgenodigd hebt voor je activiteit en van hun competenties.', - 'all_invited_restarters_modal_heading' => 'Alle uitgenodigde Restarters', - 'all_restarters_attended_modal_description' => 'Overzicht van de deelnemers aan je activiteit en van hun competenties', - 'all_restarters_attended_modal_heading' => 'Alle Restarters die deelnamen', 'approve_event' => 'Activiteit goedkeuren', 'before_submit_text' => 'Van zodra jouw community verantwoordelijke je activiteit goedkeurt, zal hij gepubliceerd worden op de Restart homepagina.', - 'by_event' => 'Op activiteit', - 'by_group' => 'Op groep', 'co2_equivalence_visualisation_dropdown' => 'Visualisatie van CO2 equivalent', 'create_event' => 'Activiteit aanmaken', 'create_new_event' => 'Nieuwe activiteit aanmaken', - 'download-results' => 'Resultaten downloaden als CSV-bestand', 'edit_event' => 'Activiteit bewerken', 'edit_event_content' => 'Verdergaan en de info van je activiteit bewerken', 'event' => 'Activiteit', @@ -50,7 +43,6 @@ 'option_not_registered' => 'Niet geregistreerd op de Fixometer', 'pending_rsvp_button' => 'Ik doe mee', 'pending_rsvp_message' => 'Je hebt een openstaande uitnodiging voor deze activiteit', - 'reporting' => 'Reporting', 'rsvp_button' => 'Sorry, ik kan niet langer deelnemen', 'rsvp_message' => 'Super! Je neemt deel aan deze activiteit', 'sample_text_message_to_restarters' => '', @@ -58,8 +50,6 @@ 'send_invites_to_restarters_tickbox' => 'Uitnodigingen voor groepsleden toevoegen. Groepsleden met een ⚠ zullen uitgenodigd worden, maar krijgen geen e-mail omdat ze \'e-mailmeldingen\' uitgezet hebben.', 'send_invite_button' => 'Uitnodigingen versturen', 'share_stats_header' => 'Statistieken delen', - 'table_skills_column' => 'Competenties', - 'table_restarter_column' => 'Restarter', 'stat-7' => 'Vermeden afval', 'stat-0' => 'Deelnemers', 'stat-2' => 'Restarters', diff --git a/lang/ne/general.php b/lang/ne/general.php index c51d0fe0ad..d888aae15f 100644 --- a/lang/ne/general.php +++ b/lang/ne/general.php @@ -8,7 +8,6 @@ 'email_alerts_pref2' => 'Ik wil graag meldingen vie e-mail ontvangen over activiteiten of groepen in mijn buurt', 'email_alerts_text' => 'Kies aub welke meldingen je via e-mail wil ontvangen. Je kan deze instelling altijd aanpassen. Ons privacy beleid vind je hier', 'faq_url' => 'https://therestartproject.org/faq', - 'filter-results' => 'Resultaten filteren', 'general' => 'Algemeen', 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'introduction_message' => 'Wij zijn een wereldwijde gemeenschap van mensen die activiteiten organiseren waarop we mensen helpen om hun electro-apparaten te repareren. Voeg je bij ons!', @@ -22,7 +21,6 @@ 'menu_wiki' => 'Wiki', 'new_group' => 'Een nieuwe groep maken', 'other_profile' => 'profiel', - 'please_select' => 'Selecteer iets aub', 'profile' => 'Jouw profiel', 'profile_content' => 'Geef aub wat info over jezelf. Zo kun je makkelijker in contact komen met andere organisatoren en herstellers. En het helpt ons om de gemeenschap beter te begrijpen.', 'repair_skills' => 'Competenties', diff --git a/lang/ne/groups.php b/lang/ne/groups.php index 281219305c..08343d9b40 100644 --- a/lang/ne/groups.php +++ b/lang/ne/groups.php @@ -33,7 +33,6 @@ 'group_admin_only' => 'Enkel voor beheerders', 'group_image' => 'Afbeelding van de groep', 'group_tag' => 'Label', - 'group_tag2' => 'Groepslabel', 'group_tags' => 'Groepslabels', 'headline_stats_dropdown' => 'Statistieken op een rij', 'headline_stats_message' => 'Deze widget toont de groepsstatistieken op een rij, bv het aantal deelnemers op je Repair Café, het aantal uren vrijwlligerswerk', diff --git a/lang/ne/reporting.php b/lang/ne/reporting.php index d4b92d9912..ab191903ad 100644 --- a/lang/ne/reporting.php +++ b/lang/ne/reporting.php @@ -1,36 +1,11 @@ 'Leeftijdscategorie', - 'average_age' => 'Gemiddelde leeftijd', 'breakdown_by_city' => 'Verdeling per stad.', 'breakdown_by_city_content' => 'Uren vrijwilligerswerk gegroepeerd per stad/gemeente (opmerking: stad/gemeente is niet verplicht in te vullen. Dit is dus misschien niet bij alle vrijwilligers aangegeven).', 'breakdown_by_country' => 'Verdeling per land.', 'breakdown_by_country_content' => 'Uren vrijwilligerswerk gegroepeerd per land.', - 'by_location' => 'Op locatie', - 'by_users' => 'Op vrijwilliger', - 'country' => 'Land', 'country_name' => 'Naam van het land', - 'event_date' => 'Datum van de activiteit', - 'event_name' => 'Activiteit', - 'gender' => 'Gender', - 'hours' => 'Uren', - 'include_anonymous_users' => 'Anonieme gebruikers insluiten', - 'miscellaneous' => 'Diversen', - 'no' => 'Nee', - 'number_of_anonymous_users' => 'Aantal anonieme gebruikers', - 'number_of_groups' => 'Aantal groepen', - 'placeholder_age_range' => 'Kies leeftijdscategorie', - 'placeholder_gender' => 'Kies gender', - 'placeholder_gender_text' => 'Zoek gender', - 'placeholder_group' => 'Kies groep', - 'placeholder_name' => 'Zoek naam', - 'restarter_name' => 'Restarter', - 'restart_group' => 'Groep', - 'search-all-time-volunteered' => 'Zoek uren vrijwilligerswerk', - 'see_all_results' => 'Bekijk alle resultaten', 'total_hours' => 'Totaal aantal uren', - 'total_number_of_users' => 'Totaal aantal gebruikers', 'town_city_name' => 'Naam van de stad of gemeente', - 'yes' => 'Ja', ]; diff --git a/lang/nl-BE/devices.php b/lang/nl-BE/devices.php index a877a970cc..2145251bc6 100644 --- a/lang/nl-BE/devices.php +++ b/lang/nl-BE/devices.php @@ -1,7 +1,6 @@ 'Op datum', 'age' => 'Leeftijd', 'brand' => 'Merk', 'category' => 'Categorie', @@ -11,8 +10,6 @@ 'export_device_data' => 'Exporteer de gegevens van de toestellen', 'fixed' => 'Hersteld', 'from_date' => 'Vanaf', - 'from_manufacturer' => 'Van producent', - 'from_third_party' => 'Van derde partij', 'graphic-camera' => 'Camera', 'graphic-comment' => 'Commentaar', 'group' => 'Groep', @@ -27,7 +24,6 @@ 'weight' => 'Gewicht', 'required_impact' => 'kg - required for environmental impact calculation', 'age_approx' => 'years - approximate, if known', - 'repair_source' => 'Source of repair information', 'description_powered' => 'Een elektrisch toestel is alles wat elektriciteit nodig heeft om te werken.', 'description_unpowered' => 'Een niet-elektrisch voorwerp is alles wat geen elektriciteit nodig heeft om te werken.', 'powered_items' => 'Elektrische toestellen', diff --git a/lang/nl-BE/events.php b/lang/nl-BE/events.php index f7edada6e7..ea9eadb071 100644 --- a/lang/nl-BE/events.php +++ b/lang/nl-BE/events.php @@ -5,18 +5,11 @@ 'about_event_name_header' => 'Over :event', 'add_event' => 'Activiteit toevoegen', 'add_volunteer_modal_heading' => 'Vrijwilliger toevoegen', - 'all_invited_restarters_modal_description' => 'Overzicht van de Restarters die je uitgenodigd hebt voor je activiteit en van hun competenties.', - 'all_invited_restarters_modal_heading' => 'Alle uitgenodigde Restarters', - 'all_restarters_attended_modal_description' => 'Overzicht van de deelnemers aan je activiteit en van hun competenties', - 'all_restarters_attended_modal_heading' => 'Alle Restarters die deelnamen', 'approve_event' => 'Activiteit goedkeuren', 'before_submit_text' => 'Van zodra jouw community verantwoordelijke je activiteit goedkeurt, zal hij gepubliceerd worden op de Restart homepagina.', - 'by_event' => 'Op activiteit', - 'by_group' => 'Op groep', 'co2_equivalence_visualisation_dropdown' => 'Visualisatie van CO2 equivalent', 'create_event' => 'Activiteit aanmaken', 'create_new_event' => 'Nieuwe activiteit aanmaken', - 'download-results' => 'Resultaten downloaden als CSV-bestand', 'edit_event' => 'Activiteit bewerken', 'edit_event_content' => 'Verdergaan en de info van je activiteit bewerken', 'event' => 'Activiteit', @@ -50,7 +43,6 @@ 'option_not_registered' => 'Niet geregistreerd op de Fixometer', 'pending_rsvp_button' => 'Ik doe mee', 'pending_rsvp_message' => 'Je hebt een openstaande uitnodiging voor deze activiteit', - 'reporting' => 'Verslagen', 'rsvp_button' => 'Klik hier om je deelname te annuleren', 'rsvp_message' => 'Je neemt deel aan deze activiteit. Super!', 'sample_text_message_to_restarters' => '', @@ -58,8 +50,6 @@ 'send_invites_to_restarters_tickbox' => 'Uitnodigingen voor groepsleden toevoegen. Groepsleden met een ⚠ zullen uitgenodigd worden, maar krijgen geen e-mail omdat ze \'e-mailmeldingen\' uitgezet hebben.', 'send_invite_button' => 'Uitnodigingen versturen', 'share_stats_header' => 'Statistieken delen', - 'table_skills_column' => 'Competenties', - 'table_restarter_column' => 'Restarter', 'stat-7' => 'Afval vermeden', 'stat-0' => 'Deelnemers', 'stat-2' => 'Vrijwilligers', diff --git a/lang/nl-BE/general.php b/lang/nl-BE/general.php index dc24f16abe..9db8c4d51d 100644 --- a/lang/nl-BE/general.php +++ b/lang/nl-BE/general.php @@ -8,7 +8,6 @@ 'email_alerts_pref2' => 'Ik wil graag meldingen vie e-mail ontvangen over activiteiten of groepen in mijn buurt', 'email_alerts_text' => 'Kies aub welke meldingen je via e-mail wil ontvangen. Je kan deze instelling altijd aanpassen. Ons privacy beleid vind je hier', 'faq_url' => 'https://therestartproject.org/faq', - 'filter-results' => 'Resultaten filteren', 'general' => 'Algemeen', 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'introduction_message' => 'Wij zijn een wereldwijde community die mensen helpt om hun elektrische toestellen te herstellen. Kom erbij!', @@ -22,7 +21,6 @@ 'menu_wiki' => 'Wiki', 'new_group' => 'Een nieuwe groep maken', 'other_profile' => 'profiel', - 'please_select' => 'Selecteer iets aub', 'profile' => 'Jouw profiel', 'profile_content' => 'Schrijf hier wat info over jezelf. Zo leg je makkelijker contact met andere organisatoren en herstellers. Je info geeft ons ook meer inzicht in de Repair Community.', 'repair_skills' => 'Competenties', diff --git a/lang/nl-BE/groups.php b/lang/nl-BE/groups.php index d6b395b7a9..b3370944e3 100644 --- a/lang/nl-BE/groups.php +++ b/lang/nl-BE/groups.php @@ -33,7 +33,6 @@ 'group_admin_only' => 'Enkel voor beheerders', 'group_image' => 'Afbeelding van de groep', 'group_tag' => 'Label', - 'group_tag2' => 'Groepslabel', 'group_tags' => 'Groepslabels', 'headline_stats_dropdown' => 'Statistieken op een rij', 'headline_stats_message' => 'Deze widget toont de groepsstatistieken op een rij, bv het aantal deelnemers op je Repair Café, het aantal uren vrijwlligerswerk', diff --git a/lang/nl-BE/reporting.php b/lang/nl-BE/reporting.php index d4b92d9912..ab191903ad 100644 --- a/lang/nl-BE/reporting.php +++ b/lang/nl-BE/reporting.php @@ -1,36 +1,11 @@ 'Leeftijdscategorie', - 'average_age' => 'Gemiddelde leeftijd', 'breakdown_by_city' => 'Verdeling per stad.', 'breakdown_by_city_content' => 'Uren vrijwilligerswerk gegroepeerd per stad/gemeente (opmerking: stad/gemeente is niet verplicht in te vullen. Dit is dus misschien niet bij alle vrijwilligers aangegeven).', 'breakdown_by_country' => 'Verdeling per land.', 'breakdown_by_country_content' => 'Uren vrijwilligerswerk gegroepeerd per land.', - 'by_location' => 'Op locatie', - 'by_users' => 'Op vrijwilliger', - 'country' => 'Land', 'country_name' => 'Naam van het land', - 'event_date' => 'Datum van de activiteit', - 'event_name' => 'Activiteit', - 'gender' => 'Gender', - 'hours' => 'Uren', - 'include_anonymous_users' => 'Anonieme gebruikers insluiten', - 'miscellaneous' => 'Diversen', - 'no' => 'Nee', - 'number_of_anonymous_users' => 'Aantal anonieme gebruikers', - 'number_of_groups' => 'Aantal groepen', - 'placeholder_age_range' => 'Kies leeftijdscategorie', - 'placeholder_gender' => 'Kies gender', - 'placeholder_gender_text' => 'Zoek gender', - 'placeholder_group' => 'Kies groep', - 'placeholder_name' => 'Zoek naam', - 'restarter_name' => 'Restarter', - 'restart_group' => 'Groep', - 'search-all-time-volunteered' => 'Zoek uren vrijwilligerswerk', - 'see_all_results' => 'Bekijk alle resultaten', 'total_hours' => 'Totaal aantal uren', - 'total_number_of_users' => 'Totaal aantal gebruikers', 'town_city_name' => 'Naam van de stad of gemeente', - 'yes' => 'Ja', ]; diff --git a/lang/no/devices.php b/lang/no/devices.php index 7e9faab0e7..d7f09e83a0 100644 --- a/lang/no/devices.php +++ b/lang/no/devices.php @@ -3,7 +3,6 @@ return [ 'devices' => 'Devices', 'export_device_data' => 'Export device data', - 'by_date' => 'By date', 'various' => 'Various', 'category' => 'Category', 'group' => 'Group', @@ -23,10 +22,7 @@ 'age' => 'Age', 'devices_description' => 'Description of problem/solution', 'delete_device' => 'Delete device', - 'from_manufacturer' => 'From manufacturer', - 'from_third_party' => 'From third party', 'weight' => 'Weight', 'required_impact' => 'kg - required for environmental impact calculation', 'age_approx' => 'years - approximate, if known', - 'repair_source' => 'Source of repair information', ]; diff --git a/lang/no/events.php b/lang/no/events.php index da567088f9..c4144ee508 100644 --- a/lang/no/events.php +++ b/lang/no/events.php @@ -13,12 +13,6 @@ 'embed_code_header' => 'Embed code', 'infographic_message' => 'An infographic of an easy-to-understand equivalent of the CO2 emissions that your group has prevented', 'headline_stats_message' => 'This widget shows the headline stats for your event e.g. the number of participants at your parties; the hours volunteered', - 'all_invited_restarters_modal_heading' => 'All invited Restarters', - 'all_invited_restarters_modal_description' => 'An overview of the Restarters invited to your event and their skills.', - 'table_restarter_column' => 'Restarter', - 'table_skills_column' => 'Skills', - 'all_restarters_attended_modal_heading' => 'All Restarters attended', - 'all_restarters_attended_modal_description' => 'An overview of who attended your event and their skills.', 'invite_restarters_modal_heading' => 'Invite volunteers to the event', 'send_invites_to_restarters_tickbox' => 'Add invites for group members. Members marked with a ⚠ will be invited but won\'t be sent an email due to their notification settings.', 'manual_invite_box' => 'Send invites to', @@ -37,8 +31,6 @@ 'option_default' => '-- Select --', 'events' => 'Events', 'event' => 'Event', - 'by_event' => 'By event', - 'by_group' => 'By group', 'create_new_event' => 'Create new event', 'create_event' => 'Create event', 'edit_event' => 'Edit event', @@ -68,7 +60,5 @@ 'field_add_image' => 'Add images', 'before_submit_text' => 'Once confirmed by our community lead, your event will be made public on The Restart Project homepage.', 'save_event' => 'Save Event', - 'reporting' => 'Reporting', - 'download-results' => 'Download Results (CSV)', 'approve_event' => 'Approve Event', ]; diff --git a/lang/no/general.php b/lang/no/general.php index 12d6614a2e..a9e4687575 100644 --- a/lang/no/general.php +++ b/lang/no/general.php @@ -23,7 +23,6 @@ 'email_alerts_text' => 'Please choose what kind of email updates you would like to receive. You can change these at any time. Our Privacy Policy is available here', 'email_alerts_pref1' => 'I would like to receive The Restart Project monthly newsletter', 'email_alerts_pref2' => 'I would like to receive email notifications about events or groups near me', - 'filter-results' => 'Filter results', 'menu_tools' => 'Community Tools', 'menu_discourse' => 'Discussion', 'menu_wiki' => 'Wiki', @@ -34,5 +33,4 @@ 'help_feedback_url' => 'https://talk.restarters.net/c/help', 'faq_url' => 'https://therestartproject.org/faq', 'restartproject_url' => 'https://therestartproject.org', - 'please_select' => 'Please select', ]; diff --git a/lang/no/groups.php b/lang/no/groups.php index 0fc65e5f9c..51caa75f6e 100644 --- a/lang/no/groups.php +++ b/lang/no/groups.php @@ -21,7 +21,6 @@ 'location' => 'Group location', 'groups_approval_text' => 'Group submissions need to be approved by an administrator', 'group_tag' => 'Tag', - 'group_tag2' => 'Group tag', 'group_admin_only' => 'Admin only', 'group_tags' => 'Group tags', 'approve_group' => 'Approve group', diff --git a/lang/no/reporting.php b/lang/no/reporting.php index b211130216..0437b397f2 100644 --- a/lang/no/reporting.php +++ b/lang/no/reporting.php @@ -1,36 +1,11 @@ 'Search time volunteered', - 'by_users' => 'By volunteer', - 'by_location' => 'By location', - 'age_range' => 'Age range', - 'gender' => 'Gender', - 'placeholder_name' => 'Search name', - 'placeholder_gender_text' => 'Search gender', - 'placeholder_age_range' => 'Choose age range', - 'placeholder_group' => 'Choose group', - 'placeholder_gender' => 'Choose gender', - 'miscellaneous' => 'Miscellaneous', - 'include_anonymous_users' => 'Include anonymous users', - 'yes' => 'Yes', - 'no' => 'No', - 'country' => 'Country', - 'average_age' => 'Average age', - 'number_of_groups' => 'Number of groups', - 'total_number_of_users' => 'Total number of users', - 'number_of_anonymous_users' => 'Number of anonymous users', 'breakdown_by_country' => 'Breakdown by country', 'breakdown_by_city' => 'Breakdown by city', 'breakdown_by_country_content' => 'Volunteer hours grouped by volunteer country.', 'breakdown_by_city_content' => 'Volunteer hours grouped by the volunteer town/city (note: town/country is optional so may not be set for all volunteers).', - 'see_all_results' => 'See all results', 'total_hours' => 'Total hours', 'country_name' => 'Country name', 'town_city_name' => 'Town/city name', - 'restarter_name' => 'Restarter', - 'hours' => 'Hours', - 'event_date' => 'Event date', - 'event_name' => 'Event', - 'restart_group' => 'Group', ]; diff --git a/resources/views/partials/group-device-breakdown.blade.php b/resources/views/partials/group-device-breakdown.blade.php deleted file mode 100644 index 9050674680..0000000000 --- a/resources/views/partials/group-device-breakdown.blade.php +++ /dev/null @@ -1,105 +0,0 @@ - diff --git a/tests/Feature/Commands/DiscourseTest.php b/tests/Feature/Commands/DiscourseTest.php index c872fee7dd..1eb0450124 100644 --- a/tests/Feature/Commands/DiscourseTest.php +++ b/tests/Feature/Commands/DiscourseTest.php @@ -2,6 +2,9 @@ namespace Tests\Commands; +use App\Group; +use App\Network; +use App\User; use DB; use Tests\TestCase; @@ -11,6 +14,20 @@ public function testSyncDiscourseUsernames() { } public function testDiscourseSyncGroups() { + $user = User::factory()->administrator()->create([ + 'api_token' => '1234', + ]); + $this->actingAs($user); + $idgroups = $this->createGroup(); + $group = Group::findOrFail($idgroups); + + $this->artisan('network:create testname testshortname "test description" --website="https://therestartproject.org" --language=fr --timezone="Asia/Samarkand" --wordpress --zapier --drip --auto-approve-events')->assertExitCode(0); + $network = Network::orderBy('id', 'desc')->first(); + $network->discourse_group = 1234; + $network->save(); + $network->addGroup($group); + + $this->artisan('group:create_discourse_group')->assertExitCode(0); $this->artisan('discourse:syncgroups')->assertExitCode(0); } } \ No newline at end of file diff --git a/tests/Feature/Devices/EditTest.php b/tests/Feature/Devices/EditTest.php index 87858eaab2..fabd2a150c 100644 --- a/tests/Feature/Devices/EditTest.php +++ b/tests/Feature/Devices/EditTest.php @@ -133,7 +133,7 @@ public function testDeviceEditAddImage() { self::assertEquals(1, count($ret['images'])); // And again, which will test we can upload two. - file_put_contents('/tmp/UT2.jpg', file_get_contents('public/images/community.jpg')); + file_put_contents('/tmp/UT2.jpg', file_get_contents(public_path() .'/images/community.jpg')); $_FILES = [ 'file' => [ @@ -189,7 +189,7 @@ public function testDeviceAddAddImage() { self::assertEquals(1, count($ret['images'])); // And again, which will test we can upload two. - file_put_contents('/tmp/UT2.jpg', file_get_contents('public/images/community.jpg')); + file_put_contents('/tmp/UT2.jpg', file_get_contents(public_path() .'/images/community.jpg')); $_FILES = [ 'file' => [ diff --git a/tests/Feature/Events/DeleteEventTest.php b/tests/Feature/Events/DeleteEventTest.php index 71a1918fa1..78bd016d6e 100644 --- a/tests/Feature/Events/DeleteEventTest.php +++ b/tests/Feature/Events/DeleteEventTest.php @@ -51,6 +51,11 @@ public function an_admin_can_delete_an_event() $event = Party::factory()->create(['wordpress_post_id' => 1, 'approved' => true, 'group' => $group->idgroups]); $event->save(); + // Check the outbound controller info works. + $response = $this->get("/outbound/info/party/{$event->idevents}"); + $response->assertSuccessful(); + $response->assertSeeText('or like the manufacture'); + // Add a volunteer so that we get some stats. $user = User::factory()->restarter()->create(); $this->actingAs($user); diff --git a/tests/Feature/Events/ModerationEventPhotosNotificationTest.php b/tests/Feature/Events/ModerationEventPhotosNotificationTest.php index 715c7aaeeb..28ae74009e 100644 --- a/tests/Feature/Events/ModerationEventPhotosNotificationTest.php +++ b/tests/Feature/Events/ModerationEventPhotosNotificationTest.php @@ -49,7 +49,7 @@ public function a_moderation_notification_is_sent_to_admins_when_event_photos_ar $_SERVER['DOCUMENT_ROOT'] = getcwd(); \FixometerFile::$uploadTesting = TRUE; - file_put_contents('/tmp/UT.jpg', file_get_contents('public/images/community.jpg')); + file_put_contents('/tmp/UT.jpg', file_get_contents(public_path() .'/images/community.jpg')); $_FILES = [ 'file' => [ diff --git a/tests/Feature/Events/WordpressEventPushTest.php b/tests/Feature/Events/WordpressEventPushTest.php index 27fd28427a..4be0d4be62 100644 --- a/tests/Feature/Events/WordpressEventPushTest.php +++ b/tests/Feature/Events/WordpressEventPushTest.php @@ -55,8 +55,9 @@ public function given_restart_network_when_event_approved_then_pushed_to_wordpre ]); $event->approve(); - $this->artisan("queue:work --stop-when-empty"); + + $this->artisan('sync:events'); } /** @test */ diff --git a/tests/Feature/Fixometer/BasicTest.php b/tests/Feature/Fixometer/BasicTest.php index 313b5f77ca..e71d1d3b39 100644 --- a/tests/Feature/Fixometer/BasicTest.php +++ b/tests/Feature/Fixometer/BasicTest.php @@ -38,12 +38,29 @@ public function testPageLoads() $this->loginAsTestUser(); $response = $this->get('/fixometer'); - // No actual cluster info in test environment. $clusters = json_encode([ [ 'idclusters' => 1, 'name' => 'Computers and Home Office', - 'categories' => [], + 'categories' => [ + 0 => [ + 'idcategories' => 11, + 'name' => 'Desktop computer', + 'powered' => 1, + 'weight' => null, + 'footprint' => null, + 'footprint_reliability' => null, + 'lifecycle' => null, + 'lifecycle_reliability' => null, + 'extendend_lifecycle' => null, + 'extendend_lifecycle_reliability' => null, + 'revision' => 2, + 'cluster' => 1, + 'aggregate' => 0, + 'description_short' => '', + 'description_long' => '', + ] + ] ], [ 'idclusters' => 2, diff --git a/tests/Feature/Groups/APIv2GroupTest.php b/tests/Feature/Groups/APIv2GroupTest.php index d1a962de62..41883f3c46 100644 --- a/tests/Feature/Groups/APIv2GroupTest.php +++ b/tests/Feature/Groups/APIv2GroupTest.php @@ -139,7 +139,7 @@ public function testCreateGroupLoggedOutWithToken() $_SERVER['DOCUMENT_ROOT'] = getcwd(); \FixometerFile::$uploadTesting = TRUE; - file_put_contents('/tmp/UT.jpg', file_get_contents('public/images/community.jpg')); + file_put_contents('/tmp/UT.jpg', file_get_contents(public_path() .'/images/community.jpg')); $_FILES = [ 'image' => [ diff --git a/tests/Feature/Groups/GroupEditTest.php b/tests/Feature/Groups/GroupEditTest.php index eba23f12c1..86df3762f4 100644 --- a/tests/Feature/Groups/GroupEditTest.php +++ b/tests/Feature/Groups/GroupEditTest.php @@ -105,7 +105,7 @@ public function image_upload() { // We don't upload files in a standard Laravel way, so testing upload is a bit of a hack. $_SERVER['DOCUMENT_ROOT'] = getcwd(); \FixometerFile::$uploadTesting = TRUE; - file_put_contents('/tmp/UT.jpg', file_get_contents('public/images/community.jpg')); + file_put_contents('/tmp/UT.jpg', file_get_contents(public_path() . '/images/community.jpg')); $_FILES = [ 'file' => [ diff --git a/tests/Feature/Groups/GroupViewTest.php b/tests/Feature/Groups/GroupViewTest.php index 1f62d0f1ab..04a3834591 100644 --- a/tests/Feature/Groups/GroupViewTest.php +++ b/tests/Feature/Groups/GroupViewTest.php @@ -18,19 +18,39 @@ public function testBasic() $this->loginAsTestUser(Role::ADMINISTRATOR); $id = $this->createGroup(); $this->assertNotNull($id); + + // Create an event and a fixed device, as this will be used in stats info returned from GroupController. + // We want the fixed device to be in a category with a cluster. + $event = Party::factory()->create([ + 'group' => $id, + 'event_start_utc' => Carbon::parse('1pm tomorrow')->toIso8601String(), + 'event_end_utc' => Carbon::parse('3pm tomorrow')->toIso8601String() + ]); + $device = Device::factory()->fixed()->create([ + 'category' => 11, + 'category_creation' => 11, + 'event' => $event->idevents, + ]); + + // View with id. $response = $this->get("/group/view/$id"); - $this->assertVueProperties($response, [ + $props = $this->assertVueProperties($response, [ [], [ ':idgroups' => $id, ':canedit' => 'true', ':can-see-delete' => 'true', - ':can-perform-delete' => 'true', - ':top-devices' => '[]', - ':events' => '[]', + ':can-perform-delete' => 'false', + ':top-devices' => json_encode([ + [ + 'counter' => 1, + 'name' => 'Desktop computer' + ] + ]), ], ]); + $this->assertEquals(1, count(json_decode($props[1][':events'], TRUE))); } public function testInvalidGroup() @@ -40,6 +60,13 @@ public function testInvalidGroup() $this->get('/group/view/undefined'); } + public function testInvalidGroup2() + { + $this->loginAsTestUser(Role::RESTARTER); + $this->expectException(NotFoundHttpException::class); + $this->get('/group/view/1'); + } + public function testCanDelete() { $this->loginAsTestUser(Role::ADMINISTRATOR); diff --git a/tests/Feature/Translations/CheckTest.php b/tests/Feature/Translations/CheckTest.php new file mode 100644 index 0000000000..3895967012 --- /dev/null +++ b/tests/Feature/Translations/CheckTest.php @@ -0,0 +1,22 @@ +artisan('translations:check')->assertExitCode(0); + } +} diff --git a/tests/Feature/Users/MenusTest.php b/tests/Feature/Users/MenusTest.php index 1f8b1fb1c1..b91cc9ba91 100644 --- a/tests/Feature/Users/MenusTest.php +++ b/tests/Feature/Users/MenusTest.php @@ -4,6 +4,7 @@ use App\Events\UserUpdated; use App\User; +use App\UsersPermissions; use Carbon\Carbon; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Support\Facades\Event; @@ -22,6 +23,17 @@ public function provider() 1 => 'Reporting', 2 => 'General', ], + true, + [ + 0 => 'Brands', + 1 => 'Skills', + 2 => 'Group tags', + 3 => 'Categories', + 4 => 'Users', + 5 => 'Roles', + 6 => 'Networks', + 7 => 'Translations', + ] ], [ 'NetworkCoordinator', @@ -29,6 +41,11 @@ public function provider() 0 => 'Administrator', 1 => 'General', ], + true, + [ + 0 => 'Translations', + 1 => 'Networks' + ] ], [ 'Host', @@ -36,12 +53,16 @@ public function provider() 0 => 'Reporting', 1 => 'General', ], + false, + [] ], [ 'Restarter', [ 0 => 'General', ], + false, + [] ], ]; } @@ -49,15 +70,27 @@ public function provider() /** *@dataProvider provider */ - public function testSections($role, $present) + public function testSections($role, $present, $translator, $adminMenu) { $user = User::factory()->{lcfirst($role)}()->create(); + + if ($translator) { + $up = new UsersPermissions(); + $up->user_id = $user->id; + $up->permission_id = 6; + $up->save(); + } + $this->actingAs($user); $response = $this->get('/user/menus'); $menus = json_decode($response->getContent(), true); $this->assertEquals($present, array_keys($menus)); + + if ($adminMenu && count($adminMenu)) { + $this->assertEquals($adminMenu, array_keys($menus['Administrator']['items'])); + } } public function testLoggedOut() diff --git a/tests/Feature/Users/Registration/AccountCreationTest.php b/tests/Feature/Users/Registration/AccountCreationTest.php index feae25f22b..0e69fe8559 100644 --- a/tests/Feature/Users/Registration/AccountCreationTest.php +++ b/tests/Feature/Users/Registration/AccountCreationTest.php @@ -161,18 +161,28 @@ public function testValidEmail() public function testAdminCreate() { $this->loginAsTestUser(Role::ADMINISTRATOR); + $idgroups = $this->createGroup(); $userAttributes = $this->userAttributes(); $response = $this->post('/user/create', [ 'name' => $userAttributes['name'], 'email' => $userAttributes['email'], 'role' => Role::RESTARTER, + 'groups' => [ $idgroups ] ]); $response->assertSee('User created correctly'); $this->assertDatabaseHas('users', [ 'email' => $userAttributes['email'], ]); + + // Create again - should fail. + $response = $this->post('/user/create', [ + 'name' => $userAttributes['name'], + 'email' => $userAttributes['email'], + 'role' => Role::RESTARTER, + ]); + $response->assertSee('alert-danger'); } public function testValidationFail() @@ -182,6 +192,31 @@ public function testValidationFail() $response = $this->post('/user/register/', $userAttributes); $response->assertStatus(302); - $response->assertSessionHas('errors'); + } + + /** + * @dataProvider missingProvider + */ + public function testAdminCreateErrors($remove) + { + $this->loginAsTestUser(Role::ADMINISTRATOR); + + $userAttributes = $this->userAttributes(); + $atts = [ + 'name' => $userAttributes['name'], + 'email' => $userAttributes['email'], + 'role' => Role::RESTARTER, + ]; + unset($atts[$remove]); + $response = $this->post('/user/create', $atts); + $response->assertSee('alert-danger'); + } + + public function missingProvider() { + return [ + [ 'email' ], + [ 'role' ], + [ 'name' ], + ]; } }