Merge

5 years ago · aa99ab1374
parent ed713e1dbf 1ea03242d0
commit aa99ab1374
19 changed files with 333 additions and 334 deletions
--- a/main/admin/periodic_export.php
+++ b/main/admin/periodic_export.php
@ -10,7 +10,7 @@ api_set_more_memory_and_time_limits();
 $this_section = SECTION_PLATFORM_ADMIN;
 $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')];

-$nameTools = get_lang('PeriodicExports');
+$nameTools = get_lang('PeriodicExport');
 $export = '';

 Display::display_header($nameTools);
--- a/main/admin/statistics/index.php
+++ b/main/admin/statistics/index.php
@ -165,13 +165,13 @@ in_array(
                ';

            $reportName1 = get_lang('UsersCreatedInTheSelectedPeriod');
-            $reportName2 = get_lang('UserByStatus');
-            $reportName3 = get_lang('UserByLanguage');
-            $reportName4 = get_lang('UserByLanguageCible');
-            $reportName5 = get_lang('UserByCareer');
-            $reportName6 = get_lang('UserByContract');
-            $reportName7 = get_lang('UserByCertificate');
-            $reportName8 = get_lang('UserByAge');
+            $reportName2 = get_lang('UsersByStatus');
+            $reportName3 = get_lang('UsersByLanguage');
+            $reportName4 = get_lang('UsersByTargetLanguage');
+            $reportName5 = get_lang('UsersByCareer');
+            $reportName6 = get_lang('UsersByContract');
+            $reportName7 = get_lang('UsersByCertificate');
+            $reportName8 = get_lang('UsersByAge');

            //$url1 = $urlBase.'a=users_active&filter=active&date_start='.$dateStart.'&date_end='.$dateEnd;
            $url2 = $urlBase.'a=users_active&filter=status&date_start='.$dateStart.'&date_end='.$dateEnd;
--- a/main/cron/lang/list_undefined_langvars.php
+++ b/main/cron/lang/list_undefined_langvars.php
@ -41,7 +41,9 @@ foreach ($files as $file) {
    $lines = file($file);
    foreach ($lines as $line) {
        $myterms = [];
-        $res = preg_match_all('/get_lang\(\'(\\w*)\'\)/', $line, $myterms);
+        // Find terms but ignore those starting with ->get_lang(), which are
+        // for plugins
+        $res = preg_match_all('/(?<!-\>)get_lang\(\'(\\w*)\'\)/', $line, $myterms);
        if ($res > 0) {
            foreach ($myterms[1] as $term) {
                if (!isset($defined_terms[$term]) && !isset($defined_terms['lang'.$term])) {
--- a/main/group/group_overview.php
+++ b/main/group/group_overview.php
@ -60,7 +60,7 @@ if (isset($_GET['action'])) {
                    DocumentManager::file_send_for_download(
                        $tempZipFile,
                        true,
-                        get_lang('Surveys').'-'.api_get_course_id().'-'.api_get_local_time().'.zip'
+                        get_lang('SurveysWordInASCII').'-'.api_get_course_id().'-'.api_get_local_time().'.zip'
                    );
                    unlink($tempZipFile);
                    exit;
--- a/main/inc/lib/NotificationEvent.php
+++ b/main/inc/lib/NotificationEvent.php
@ -67,7 +67,7 @@ class NotificationEvent extends Model
        $form->addTextarea('content', get_lang('Content'));
        $form->addText('link', get_lang('Link'), false);
        $form->addCheckBox('persistent', get_lang('Persistent'));
-        $form->addNumeric('day_diff', get_lang('DayDiff'), false);
+        $form->addNumeric('day_diff', get_lang('DaysDifference'), false);

        return $form;
    }
@ -90,7 +90,7 @@ class NotificationEvent extends Model
            $form->addTextarea('content', get_lang('Content'));
            $form->addText('link', get_lang('Link'), false);
            $form->addCheckBox('persistent', get_lang('Persistent'));
-            $form->addNumeric('day_diff', get_lang('DayDiff'), false);
+            $form->addNumeric('day_diff', get_lang('DaysDifference'), false);

            switch ($eventType) {
                case self::JUSTIFICATION_EXPIRATION:
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@ -1122,7 +1122,7 @@ class Template
        $form->addHidden('logout', 1);
        $form->addButton(
            'casLogoutButton',
-            is_null($label) ? sprintf(get_lang('LogoutWithYourAccount'), api_get_setting("Institution")) : $label,
+            is_null($label) ? sprintf(get_lang('LogoutWithYourAccountFromX'), api_get_setting("Institution")) : $label,
            api_get_setting("casLogoURL"),
            'primary',
            null,
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@ -8118,7 +8118,7 @@ class TrackingCourseLog
        );

        $lpLink = Display::url(
-            Display::return_icon('scorms.png', get_lang('CourseLPsGenericStats'), [], ICON_SIZE_MEDIUM),
+            Display::return_icon('scorms.png', get_lang('CourseLearningPathsGenericStats'), [], ICON_SIZE_MEDIUM),
            api_get_path(WEB_CODE_PATH).'tracking/lp_report.php?'.api_get_cidreq()
        );

@ -8187,7 +8187,7 @@ class TrackingCourseLog
                break;
            case 'lp':
                $lpLink = Display::url(
-                    Display::return_icon('scorms_na.png', get_lang('CourseLPsGenericStats'), [], ICON_SIZE_MEDIUM),
+                    Display::return_icon('scorms_na.png', get_lang('CourseLearningPathsGenericStats'), [], ICON_SIZE_MEDIUM),
                    '#'
                );
                break;
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@ -358,7 +358,7 @@ class IndexManager

        if ($allow) {
            $items[] = [
-                'icon' => Display::return_icon('lp_student_publication.png', get_lang('StudentPublication')),
+                'icon' => Display::return_icon('lp_student_publication.png', get_lang('StudentPublications')),
                'link' => api_get_path(WEB_CODE_PATH).'work/publications.php',
                'title' => get_lang('MyStudentPublications'),
            ];
--- a/main/lang/arabic/trad4all.inc.php
+++ b/main/lang/arabic/trad4all.inc.php
@ -8536,7 +8536,7 @@ $CourseInSession = "المقررات في الدورات";
 $UserStats = "احصاءات المستخدمين";
 $TotalNumberOfStudents = "العدد الكلي للطلبة";
 $UsersCreatedInTheSelectedPeriod = "المستخدمين الذين تم انشائهم خلال الفترة المحددة";
-$UserByLanguage = "المستخدمين لكل لغة";
+$UsersByLanguage = "المستخدمين لكل لغة";
 $Count = "احصاء";
 $SortKeys = "توزيع وفقاً";
 $SubscriptionCount = "احصاء الاشتراك";
--- a/main/lang/slovenian/trad4all.inc.php
+++ b/main/lang/slovenian/trad4all.inc.php
@ -8302,7 +8302,7 @@ $SessionsPerLanguage = "Seje po jezikih";
 $CountOfSessions = "Število sej";
 $TotalNumberOfStudents = "Skupno število učečih se";
 $UsersCreatedInTheSelectedPeriod = "Novih uporabnikov v izbranem obdobju";
-$UserByLanguage = "Uporabnikov glede na jezik";
+$UsersByLanguage = "Uporabnikov glede na jezik";
 $Count = "Število";
 $SortKeys = "Razvrščeno po";
 $ExportAsCompactCSV = "Izvozi kot kompakten CSV";
--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@ -1037,7 +1037,7 @@ if (isset($_GET['action']) and $_GET['action'] == 'all_attendance') {
    $data = $attendance->getCoursesWithAttendance($student_id, $startDate, $endDate);

    // 'attendance from %s to %s'
-    $title = sprintf(get_lang('AttendanceFromTo'), $startDateText, $endDateText);
+    $title = sprintf(get_lang('AttendanceFromXToY'), $startDateText, $endDateText);
    echo '
    <h3>'.$title.'</h3>
    <div class="">
--- a/main/mySpace/work_stats.php
+++ b/main/mySpace/work_stats.php
@ -194,7 +194,7 @@ if ($is_western_name_order) {
 }

 $table->set_header(2, get_lang('TimeSpentInTheCourse'), false);
-$table->set_header(3, get_lang('TimeSpentInWork'), false);
+$table->set_header(3, get_lang('TimeSpentOnAssignment'), false);
 $table->set_header(4, get_lang('Status'), false);

 Display::display_header($nameTools);
--- a/main/plagiarism/compilatio/compiladmin.php
+++ b/main/plagiarism/compilatio/compiladmin.php
@ -12,17 +12,13 @@ $compilatio = new Compilatio();
 $use_space = number_format($quotas->usedSpace / 1000000, 2);
 $total_space = $quotas->space / 1000000;

-echo "<h3>".get_lang('compilatioDescription')."</h3>";
+echo "<h3>".get_lang('CompilatioDescription')."</h3>";

 echo "<b>"
-    .get_lang('compilatioQuota')
+    .get_lang('CompilatioQuota')
    .":"
    ." </b><br>"
-    .get_lang('compilatioCredit')
-    .": "
-    .$quotas->usedCredits
-    .get_lang('compilatioOn')
-    .$quotas->credits;
+    .sprintf(get_lang('CompilatioCreditXOnY'), $quotas->usedCredits, $quotas->credits);

 ?>
 <br><br>
@ -35,13 +31,13 @@ if (!isset($_GET['action'])) {
 </form>
 <?php
 } else {
-        echo get_lang('compilatioConnectionTestSoap')."<br>";
-        echo "1) ".get_lang('compilatioServerConnection')."<br>";
+        echo get_lang('CompilatioConnectionTestSoap')."<br>";
+        echo "1) ".get_lang('CompilatioServerConnection')."<br>";
        $compilatio = new Compilatio();
        if ($compilatio) {
-            echo get_lang('compilatioConnectionAccomplished')."<br>";
-            echo "2) ".get_lang('compilatioSendTextToServer')."<br>";
-            $text = get_lang('compilatioTestSendText').$compilatio->getKey();
+            echo get_lang('CompilatioConnectionSuccessful')."<br>";
+            echo "2) ".get_lang('CompilatioSendTextToServer')."<br>";
+            $text = sprintf(get_lang('CompilatioTextSendingTestKeyX'), $compilatio->getKey());
            $id_compi = $compilatio->SendDoc(
            'Doc de test',
            'test',
@ -50,13 +46,14 @@ if (!isset($_GET['action'])) {
            $text
        );
            if (Compilatio::isMd5($id_compi)) {
-                echo get_lang('compilatioSuccessfulTransfer')."<br>";
+                echo get_lang('CompilatioSuccessfulTransfer')."<br>";
            } else {
-                echo get_lang('compilatioFailedTransfer')."<br>";
+                echo get_lang('CompilatioFailedTransfer')."<br>";
+                echo get_lang('CompilatioParamVerification')."<br>";
            }
        } else {
-            echo get_lang('compilatioNotConnection')."<br>";
-            echo get_lang('compilatioParamVerification')."<br>";
+            echo get_lang('CompilatioNoConnection')."<br>";
+            echo get_lang('CompilatioParamVerification')."<br>";
        }
    }
 ?>
--- a/main/survey/survey_list.php
+++ b/main/survey/survey_list.php
@ -165,7 +165,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
        DocumentManager::file_send_for_download(
            $tempZipFile,
            true,
-            get_lang('Surveys').'-'.api_get_course_id().'-'.api_get_local_time().'.zip'
+            get_lang('SurveysWordInASCII').'-'.api_get_course_id().'-'.api_get_local_time().'.zip'
        );
        unlink($tempZipFile);
    }
--- a/main/template/default/notification_event/list.tpl
+++ b/main/template/default/notification_event/list.tpl
@ -7,7 +7,7 @@
            <tr>
                <th>{{ 'Title'| get_lang }}</th>
                <th>{{ 'Type'| get_lang }}</th>
-                <th>{{ 'DayDiff'| get_lang }}</th>
+                <th>{{ 'DaysDifference'| get_lang }}</th>
                <th>{{ 'Actions'| get_lang }}</th>
            </tr>

--- a/main/tracking/lp_report.php
+++ b/main/tracking/lp_report.php
@ -392,7 +392,7 @@ $interbreadcrumb[] = [
    'name' => get_lang('Tracking'),
 ];

-$tool_name = get_lang('CourseLPsGenericStats');
+$tool_name = get_lang('CourseLearningPathsGenericStats');

 $headers = [];
 $headers[] = get_lang('FirstName');