Language: Use 'E-mail' rather than 'e-mail' everywhere to try and avoid confusion

Author: ywarnier

assets/vue/views/assignments/AssignmentMissing.vue

@@ -46,7 +46,7 @@
         </template>
       </Column>
 
-      <Column :header="t('e-mail')">
+      <Column :header="t('E-mail')">
         <template #body="slotProps">
           <a
             class="text-blue-600 hover:underline"

assets/vue/views/sessionadmin/RegisterStudent.vue

@@ -84,7 +84,7 @@
           <thead class="bg-gray-20 text-gray-90 font-medium">
             <tr>
               <th class="px-4 py-2 text-left">{{ t("Full name") }}</th>
-              <th class="px-4 py-2 text-left">{{ t("e-mail") }}</th>
+              <th class="px-4 py-2 text-left">{{ t("E-mail") }}</th>
               <th class="px-4 py-2 text-left">{{ t("Active") }}</th>
               <th class="px-4 py-2 text-left">{{ t("Local user") }}</th>
               <th class="px-4 py-2 text-right"></th>
@@ -156,7 +156,7 @@
         <InputText
           v-model="createForm.email"
           type="email"
-          :placeholder="t('Email')"
+          :placeholder="t('E-mail')"
           class="w-full"
         />
         <InputText

public/main/admin/add_users_to_usergroup.php

@@ -191,7 +191,7 @@ function change_select(val) {
     ['type' => 'text', 'name' => 'firstname', 'label' => get_lang('First name')],
     ['type' => 'text', 'name' => 'lastname', 'label' => get_lang('Last name')],
     ['type' => 'text', 'name' => 'official_code', 'label' => get_lang('Code')],
-    ['type' => 'text', 'name' => 'email', 'label' => get_lang('e-mail')],
+    ['type' => 'text', 'name' => 'email', 'label' => get_lang('E-mail')],
 ];
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?id='.$id);

public/main/admin/course_information.php

@@ -180,7 +180,7 @@ function get_course_usage($course, $session_id = 0)
         $table->set_header(1, get_lang('Last name'), true);
         $table->set_header(2, get_lang('First name'), true);
     }
-    $table->set_header(3, get_lang('e-mail'), true);
+    $table->set_header(3, get_lang('E-mail'), true);
     $table->set_header(4, get_lang('Status'), true);
     $table->set_header(5, '', false);
     $table->display();

public/main/admin/dashboard_add_users_to_user.php

@@ -260,7 +260,7 @@ function remove_item(origin) {
     ['type' => 'text', 'name' => 'firstname', 'label' => get_lang('First name')],
     ['type' => 'text', 'name' => 'lastname', 'label' => get_lang('Last name')],
     ['type' => 'text', 'name' => 'official_code', 'label' => get_lang('Code')],
-    ['type' => 'text', 'name' => 'email', 'label' => get_lang('e-mail')],
+    ['type' => 'text', 'name' => 'email', 'label' => get_lang('E-mail')],
 ];
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id);

public/main/admin/ldap_form_add_users_group.php

@@ -28,7 +28,7 @@
 echo '<table border="0" cellspacing="0" width="100%">';
 echo '<tr align="center" id="header3">'.
         '<td width="15%"><input type="button" value="'.get_lang('All/None').'" onClick="checkAll();"></td>'.
-        '<td width="40%"><b>'.get_lang('e-mail').'</b></td>'.
+        '<td width="40%"><b>'.get_lang('E-mail').'</b></td>'.
         ($is_western_name_order
             ? '<td width="15%"><b>'.get_lang('First name').'</b></td>'.
             '<td width="15%"><b>'.get_lang('Name').'</b></td>'

public/main/admin/ldap_users_list.php

@@ -188,7 +188,7 @@
     $table->set_header(2, get_lang('Last name'));
     $table->set_header(3, get_lang('First name'));
 }
-$table->set_header(4, get_lang('e-mail'));
+$table->set_header(4, get_lang('E-mail'));
 $table->set_header(5, get_lang('Detail'));
 //$table->set_column_filter(5, 'email_filter');
 //$table->set_column_filter(5, 'active_filter');

public/main/admin/user_edit.php

@@ -143,7 +143,7 @@ function confirmation(name) {
 $form->applyFilter('official_code', 'trim');
 
 // e-mail
-$form->addElement('text', 'email', get_lang('e-mail'));
+$form->addElement('text', 'email', get_lang('E-mail'));
 $form->addEmailRule('email');
 if ('true' == api_get_setting('registration', 'email')) {
     $form->addRule('email', get_lang('Required field'), 'required');

public/main/admin/user_information.php

@@ -153,7 +153,7 @@
 $csvContent[] = [get_lang('Information')];
 $data = [
     get_lang('Name') => $completeName,
-    get_lang('e-mail') => $user->getEmail(),
+    get_lang('E-mail') => $user->getEmail(),
     get_lang('Phone') => $user->getPhone(),
     get_lang('Course code') => $user->getOfficialCode(),
     //get_lang('Online') => !empty($user['user_is_online']) ? Display::return_icon('online.png') : Display::return_icon('offline.png'),

public/main/admin/user_list.php

@@ -1211,7 +1211,7 @@ class="btn btn--plain advanced_options" onclick="display_advanced_search_form();
 $form->addText('keyword_firstname', get_lang('First name'), false);
 $form->addText('keyword_lastname', get_lang('Last name'), false);
 $form->addText('keyword_username', get_lang('Login'), false);
-$form->addText('keyword_email', get_lang('e-mail'), false);
+$form->addText('keyword_email', get_lang('E-mail'), false);
 $form->addText('keyword_officialcode', get_lang('Code'), false);
 
 $classId = isset($_REQUEST['class_id']) && !empty($_REQUEST['class_id']) ? (int) $_REQUEST['class_id'] : 0;
@@ -1290,7 +1290,7 @@ function($from, $number_of_items, $column, $direction) use ($showDeletedUsers) {
     $table->set_header(4, get_lang('First name'));
 }
 $table->set_header(5, get_lang('Username'));
-$table->set_header(6, get_lang('e-mail'));
+$table->set_header(6, get_lang('E-mail'));
 $table->set_header(7, get_lang('Profile'));
 $table->set_header(8, get_lang('active'), true, 'width="15px"');
 $table->set_header(9, get_lang('Registration date'), true, 'width="90px"');