Browse Source

Fixing translation issues.

Julio Montoya 11 years ago
parent
commit
72e99f8d8e
4 changed files with 17 additions and 27 deletions
  1. 3 3
      main/inc/Entity/User.php
  2. 13 19
      main/inc/global.inc.php
  3. 1 1
      main/inc/services.php
  4. 0 4
      main/locale/es.custom.po

+ 3 - 3
main/inc/Entity/User.php

@@ -291,14 +291,14 @@ class User implements AdvancedUserInterface, \Serializable , EquatableInterface
 
         $metadata->addConstraint(new UniqueEntity(array(
             'fields'  => 'username',
-            'message' => 'This username already exists.',
+            'message' => 'This value is already used.',
         )));
 
         $metadata->addPropertyConstraint('username', new Assert\Length(array(
             'min'        => 2,
             'max'        => 50,
-            'minMessage' => 'Your username must be at least {{ limit }} characters length',
-            'maxMessage' => 'Your username cannot be longer than {{ limit }} characters length',
+            'minMessage' => 'This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.',
+            'maxMessage' => 'This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.',
         )));
     }
 

+ 13 - 19
main/inc/global.inc.php

@@ -624,12 +624,13 @@ $app->before(
         }
 
         /** Translator component. */
-        // Platform lang
+
+        $app['translator.cache.enabled'] = false;
 
         $language = api_get_setting('platformLanguage');
         $iso = api_get_language_isocode($language);
 
-        /** @var  Symfony\Component\Translation\Translator $translator */
+        /** @var Symfony\Component\Translation\Translator $translator */
         $translator = $app['translator'];
         $translator->setLocale($iso);
 
@@ -657,37 +658,30 @@ $app->before(
             $translator->setLocale($iso);
         }
 
-        $app['translator.cache.enabled'] = false;
-
         $app['translator'] = $app->share($app->extend('translator', function ($translator, $app) {
-
             $locale = $translator->getLocale();
 
             /** @var Symfony\Component\Translation\Translator $translator  */
             if ($app['translator.cache.enabled']) {
-
                 //$phpFileDumper = new Symfony\Component\Translation\Dumper\PhpFileDumper();
                 $dumper = new Symfony\Component\Translation\Dumper\MoFileDumper();
                 $catalogue = new Symfony\Component\Translation\MessageCatalogue($locale);
                 $catalogue->add(array('foo' => 'bar'));
                 $dumper->dump($catalogue, array('path' => $app['sys_temp_path']));
-
             } else {
                 $translator->addLoader('pofile', new PoFileLoader());
-
-                $filesToLoad = array(
-                    api_get_path(SYS_PATH).'main/locale/'.$locale.'.po',
-                    api_get_path(SYS_PATH).'main/locale/'.$locale.'.custom.po'
-                );
-
-                foreach ($filesToLoad as $file) {
-                    if (file_exists($file)) {
-                        $translator->addResource('pofile', $file, $locale);
-                    }
+                $file = $app['root_sys'].'main/locale/'.$locale.'.po';
+                if (file_exists($file)) {
+                    $translator->addResource('pofile', $file, $locale);
+                }
+                $customFile = $app['root_sys'].'main/locale/'.$locale.'.custom.po';
+                if (file_exists($customFile)) {
+                    $translator->addResource('pofile', $customFile, $locale);
                 }
 
+                // Validators
+                $file = $app['root_sys'].'vendor/symfony/validator/Symfony/Component/Validator/Resources/translations/validators.'.$locale.'.xlf';
                 $translator->addLoader('xlf', new Symfony\Component\Translation\Loader\XliffFileLoader());
-                $file = api_get_path(SYS_PATH).'vendor/symfony/validator/Symfony/Component/Validator/Resources/translations/validators.'.$locale.'.xlf';
                 if (file_exists($file)) {
                     $translator->addResource('xlf', $file, $locale, 'validators');
                 }
@@ -702,6 +696,7 @@ $app->before(
             }
         }));
 
+
         // Check if we are inside a Chamilo course tool
         $isCourseTool = (strpos($request->getPathInfo(), 'courses/') === false) ? false : true;
 
@@ -721,7 +716,6 @@ $app->before(
 
             $app['template']->assign('course_session', $session);
         }
-
     }
 );
 

+ 1 - 1
main/inc/services.php

@@ -181,7 +181,7 @@ $app->register(new Silex\Provider\ServiceControllerServiceProvider());
 
 // Implements Symfony2 translator.
 $app->register(new Silex\Provider\TranslationServiceProvider(), array(
-    'locale' => 'en, sr_Latn',
+    'locale' => 'en',
     'locale_fallback' => 'en',
     'translator.domains' => array()
 ));

+ 0 - 4
main/locale/es.custom.po

@@ -38,7 +38,3 @@ msgstr "Marcar para revisar después"
 
 msgid "SelectAnAnswerToContinue"
 msgstr "Seleccione una respuesta antes de seguir"
-
-
-
-