Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: AngelFQC

public/main/admin/extra_fields.php

@@ -37,7 +37,7 @@
 //jqgrid will use this URL to do the selects
 $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType;
 
-//The order is important you need to check the the $column variable in the model.ajax.php file
+//The order is important you need to check the $column variable in the model.ajax.php file
 $columns = $obj->getJqgridColumnNames();
 
 //Column config

public/main/inc/lib/myspace.lib.php

@@ -104,16 +104,6 @@ public static function generateAdminActionLinks(): array
         }
         return $actions;
     }
-    /**
-     * Get admin actions.
-     *
-     * @return string
-     */
-    public static function getAdminActions(bool $display = false)
-    {
-        $actions = self::generateAdminActionLinks();
-        return Display::actions($actions);
-    }
 
     /**
      * @return string

public/main/my_space/survey_report.php

@@ -36,7 +36,13 @@
 echo '<div class="actions">';
 echo MySpace::getTopMenu();
 echo '</div>';
-echo MySpace::getAdminActions();
+$actions = MySpace::generateAdminActionLinks();
+
+echo '<ul class="list-disc m-y-2">';
+foreach ($actions as $action) {
+    echo '<li><a href="'.$action['url'].'">'.$action['content'].'</a></li>'.PHP_EOL;
+}
+echo '</ul>';
 
 $form->display();
 

public/main/my_space/tc_report.php

@@ -88,7 +88,13 @@ function(response) {
 echo '<div class="actions">';
 echo MySpace::getTopMenu();
 echo '</div>';
-echo MySpace::getAdminActions();
+$actions = MySpace::generateAdminActionLinks();
+
+echo '<ul class="list-disc m-y-2">';
+foreach ($actions as $action) {
+    echo '<li><a href="'.$action['url'].'">'.$action['content'].'</a></li>'.PHP_EOL;
+}
+echo '</ul>';
 
 if ('add_user' !== $action) {
     $form = new FormValidator('language_filter');

public/main/my_space/ti_report.php

@@ -33,7 +33,13 @@
 echo '<div class="actions">';
 echo MySpace::getTopMenu();
 echo '</div>';
-echo MySpace::getAdminActions();
+$actions = MySpace::generateAdminActionLinks();
+
+echo '<ul class="list-disc m-y-2">';
+foreach ($actions as $action) {
+    echo '<li><a href="'.$action['url'].'">'.$action['content'].'</a></li>'.PHP_EOL;
+}
+echo '</ul>';
 
 echo '<style>
     .session_block {

public/main/tracking/course_session_report.php

@@ -74,7 +74,13 @@
     echo '</div>';
 
     if (api_is_platform_admin()) {
-        echo MySpace::getAdminActions();
+        $actions = MySpace::generateAdminActionLinks();
+
+        echo '<ul class="list-disc m-y-2">';
+        foreach ($actions as $action) {
+            echo '<li><a href="'.$action['url'].'">'.$action['content'].'</a></li>'.PHP_EOL;
+        }
+        echo '</ul>';
     }
 
     echo '<h2>'.get_lang('Results of learning paths exercises by session').'</h2>';

public/main/tracking/question_course_report.php

@@ -154,7 +154,13 @@ function load_courses() {
     echo '</div>';
 
     if (api_is_platform_admin()) {
-        echo MySpace::getAdminActions();
+        $actions = MySpace::generateAdminActionLinks();
+
+        echo '<ul class="list-disc m-y-2">';
+        foreach ($actions as $action) {
+            echo '<li><a href="'.$action['url'].'">'.$action['content'].'</a></li>'.PHP_EOL;
+        }
+        echo '</ul>';
     }
     echo '<br />';
     echo '<h2>'.get_lang('Learning paths exercises results list').'</h2>';

src/CoreBundle/Form/ProfileType.php

@@ -81,10 +81,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $fieldsMap = [
             'firstname' => ['field' => 'firstname', 'type' => TextType::class, 'label' => 'Firstname'],
             'lastname' => ['field' => 'lastname', 'type' => TextType::class, 'label' => 'Lastname'],
-            'officialcode' => ['field' => 'official_code', 'type' => TextType::class, 'label' => 'Official Code'],
-            'email' => ['field' => 'email', 'type' => EmailType::class, 'label' => 'Email'],
+            'officialcode' => ['field' => 'official_code', 'type' => TextType::class, 'label' => 'Official code'],
+            'email' => ['field' => 'email', 'type' => EmailType::class, 'label' => 'E-mail'],
             'picture' => ['field' => 'illustration', 'type' => IllustrationType::class, 'label' => 'Picture', 'mapped' => false],
-            'login' => ['field' => 'login', 'type' => TextType::class, 'label' => 'Login'],
+            'login' => ['field' => 'login', 'type' => TextType::class, 'label' => 'Username'],
             'password' => ['field' => 'password', 'type' => PasswordType::class, 'label' => 'Password', 'mapped' => false, 'required' => false],
             'language' => [
                 'field' => 'locale',
@@ -95,8 +95,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'placeholder' => null,
                 'choice_translation_domain' => false,
             ],
-            'phone' => ['field' => 'phone', 'type' => TextType::class, 'label' => 'Phone Number'],
-            'theme' => ['field' => 'theme', 'type' => TextType::class, 'label' => 'Theme'],
+            'phone' => ['field' => 'phone', 'type' => TextType::class, 'label' => 'Phone number'],
+            'theme' => ['field' => 'theme', 'type' => TextType::class, 'label' => 'Theme (stylesheet)'],
 
             // Core date_of_birth → entity property dateOfBirth
             'date_of_birth' => [

tests/scripts/lang/find_missing_terms.php

@@ -165,6 +165,10 @@ function extractTermsFromLine(string $line, bool $isVue): array
         // trans("term"), ->trans("term"), .trans("term")
         preg_match_all('/(?:->|\.)?trans\s*\(\s*(["\'])(.*?)(?<!\\\\)\1\s*\)/x', $line, $matches);
         addUnescapedTerms($matches, $terms);
+
+        // 'display_text' => 'term',
+        preg_match_all('/.*\'display_text\'\s\=\>\s(\')(.*?)\'/x', $line, $matches);
+        addUnescapedTerms($matches, $terms);
     }
 
     return $terms;
@@ -194,6 +198,11 @@ function addUnescapedTerms(array $matches, array &$terms): void
         } else {
             $term = unescape_single($term);
         }
+        $first = substr($term, 0, 1);
+        $last = substr($term, -1);
+        if (($first === '"' && $last === '"') || ($first === "'" && $last === "'")) {
+            $term = substr($term, 1, strlen($term) - 2);
+        }
         $terms[] = $term;
     }
 }