Correct / improve some french texts

diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php
index c41df2052ee968b9822d18a53800a832511d0c32..851eae50e3c1224c8ca20d123aab8ac847fecc11 100644 (file)
--- a/framework/application/forms/CMS/Home.php
+++ b/framework/application/forms/CMS/Home.php
@@ -2,40 +2,40 @@
 
 class Simeox_Form_CMS_Home extends Simeox_Form_CMS {
 
-    public function init() {
+       public function init() {
                parent::init();
 
-        $logo = new CubeIT_Form_Element_File_Image('site_logo');
-        $logo->setLabel(__('Logo principal'));
-        $this->addElement($logo);
-
-        $header = new Simeox_Form_CMS_Sub_ImageHeader();
-        $header->setLegend(__('Header'));
-        $this->addSubForm($header, 'hero');
-
-        // Le Simeox section
-        $simeox = new Simeox_Form_CMS_Sub_Simeox();
-        $simeox->setLegend(__("Section 'Le Simeox'"));
-        $this->addSubForm($simeox, 'simeox');
-
-        // R&D Clinic section
-        $RDClinic = new Simeox_Form_CMS_Sub_RDClinic();
-        $RDClinic->setLegend(__("Section 'R&D Clinique'"));
-        $this->addSubForm($RDClinic, 'clinic');
-
-        // About section
-        $about = new Simeox_Form_CMS_Sub_About();
-        $about->setLegend(__("Section 'A propos de PhysioAssist'"));
-        $this->addSubForm($about, 'about');
-
-        // Contact section
-        $contact = new Simeox_Form_CMS_Sub_Contact();
-        $contact->setLegend(__("Section 'Contact'"));
-        $this->addSubForm($contact, 'contact');
-
-        // Footer text
-        $footer = new Simeox_Form_Element_Markitup('footer');
-        $footer->setLabel(__('Pied de page'));
-        $this->addElement($footer);
+               $logo = new CubeIT_Form_Element_File_Image('site_logo');
+               $logo->setLabel(__('Logo principal'));
+               $this->addElement($logo);
+
+               $header = new Simeox_Form_CMS_Sub_ImageHeader();
+               $header->setLegend(__('Header'));
+               $this->addSubForm($header, 'hero');
+
+               // Le Simeox section
+               $simeox = new Simeox_Form_CMS_Sub_Simeox();
+               $simeox->setLegend(__("Section 'Le Simeox'"));
+               $this->addSubForm($simeox, 'simeox');
+
+               // R&D Clinic section
+               $RDClinic = new Simeox_Form_CMS_Sub_RDClinic();
+               $RDClinic->setLegend(__("Section 'R&D Clinique'"));
+               $this->addSubForm($RDClinic, 'clinic');
+
+               // About section
+               $about = new Simeox_Form_CMS_Sub_About();
+               $about->setLegend(__("Section 'A propos de PhysioAssist'"));
+               $this->addSubForm($about, 'about');
+
+               // Contact section
+               $contact = new Simeox_Form_CMS_Sub_Contact();
+               $contact->setLegend(__("Section 'Contact'"));
+               $this->addSubForm($contact, 'contact');
+
+               // Footer text
+               $footer = new Simeox_Form_Element_Markitup('footer');
+               $footer->setLabel(__('Footer'));
+               $this->addElement($footer);
        }
 }
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Carousel.php b/framework/application/forms/CMS/Sub/Carousel.php
index 068916d3ede26f1e1dc66fd217af099913ffe14b..a308cb5372d4d8adcafcd502794aacf5daa6acae 100644 (file)
--- a/framework/application/forms/CMS/Sub/Carousel.php
+++ b/framework/application/forms/CMS/Sub/Carousel.php
@@ -2,22 +2,22 @@
 
 class Simeox_Form_CMS_Sub_Carousel extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
+       public function init() {
+               parent::init();
 
-        $heading = new Zend_Form_Element_Text('heading');
-        $heading->setLabel(__('Titre'));
-        $this->addElement($heading);
+               $heading = new Zend_Form_Element_Text('heading');
+               $heading->setLabel(__('Titre'));
+               $this->addElement($heading);
 
-        $subheading = new Zend_Form_Element_Text('subheading');
-        $subheading->setAttrib('rows', 2);
-        $subheading->setLabel(__('Sous-titre'));
-        $this->addElement($subheading);
+               $subheading = new Zend_Form_Element_Text('subheading');
+               $subheading->setAttrib('rows', 2);
+               $subheading->setLabel(__('Sous-titre'));
+               $this->addElement($subheading);
 
-        $carousel = new Simeox_Form_CMS_Sub_Carousel_Carousel();
-        $carousel->setLegend(__('Carrousel des images'));
-        $this->addSubForm($carousel, 'image_carousel');
+               $carousel = new Simeox_Form_CMS_Sub_Carousel_Carousel();
+               $carousel->setLegend(__('Carrousel'));
+               $this->addSubForm($carousel, 'image_carousel');
 
 
-    }
+       }
 }
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Carousel/Carousel.php b/framework/application/forms/CMS/Sub/Carousel/Carousel.php
index 220d81fea006851d4b44e13b47fda28766305b7c..e69e7f1a2f755fa616386d59b58094aa89bf9380 100755 (executable)
--- a/framework/application/forms/CMS/Sub/Carousel/Carousel.php
+++ b/framework/application/forms/CMS/Sub/Carousel/Carousel.php
@@ -5,8 +5,8 @@ class Simeox_Form_CMS_Sub_Carousel_Carousel extends CubeIT_Form_Multi_SubForm {
        public function init() {\r
                parent::init();\r
                $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Carousel_Item())\r
-                               ->setBaseLegend('Edition de carousel item « $title »')\r
-                               ->setNewLegend('Nouvelle carousel item');\r
+                       ->setBaseLegend('Edition de la slide « $title »')\r
+                       ->setNewLegend('Nouvelle slide');\r
        }\r
 \r
 }\r

diff --git a/framework/application/forms/CMS/Sub/ImageHeader.php b/framework/application/forms/CMS/Sub/ImageHeader.php
index f68a41dac24d24c5c4da0bceee6e3b40f23a7fdd..ea5817a84c27d73664566760370169e50537f9d5 100644 (file)
--- a/framework/application/forms/CMS/Sub/ImageHeader.php
+++ b/framework/application/forms/CMS/Sub/ImageHeader.php
@@ -15,11 +15,11 @@ class Simeox_Form_CMS_Sub_ImageHeader extends CubeIT_Form_SubForm {
         $this->addElement($subheading);
 
         $bg_color = new CubeIT_Form_Element_Color('bg_color');
-        $bg_color->setLabel(__('Couleur en arrière-plan'));
+        $bg_color->setLabel(__('Couleur de fond'));
         $this->addElement($bg_color);
 
         $image = new CubeIT_Form_Element_File_Image('image');
-        $image->setLabel(__("Image d'arrière-plan"));
+        $image->setLabel(__("Image de fond"));
         $image->setMaxItems(1);
         $this->addElement($image);
     }

diff --git a/framework/application/forms/CMS/Sub/Operation.php b/framework/application/forms/CMS/Sub/Operation.php
index 425aad3d461ce8ce6659e490b79e17cb5a5dc995..46849dffdc976e9f0504dfc18636ec0846427e5c 100644 (file)
--- a/framework/application/forms/CMS/Sub/Operation.php
+++ b/framework/application/forms/CMS/Sub/Operation.php
@@ -23,7 +23,7 @@ class Simeox_Form_CMS_Sub_Operation extends CubeIT_Form_SubForm {
         $this->addElement($video);
 
         $bg_image = new CubeIT_Form_Element_File_Image('bg_image');
-        $bg_image->setLabel(__("Image d'arrière-plan"));
+        $bg_image->setLabel(__("Image de fond"));
         $bg_image->setMaxItems(1);
         $this->addElement($bg_image);
 

diff --git a/framework/application/forms/CMS/Sub/Partners/Partner.php b/framework/application/forms/CMS/Sub/Partners/Partner.php
index ce93bf4273e10e91084b973fddddea80d5f1f1ae..0ce2575e7aae4404f3b05ec6be665259da1a24c8 100644 (file)
--- a/framework/application/forms/CMS/Sub/Partners/Partner.php
+++ b/framework/application/forms/CMS/Sub/Partners/Partner.php
@@ -6,7 +6,7 @@ class Simeox_Form_CMS_Sub_Partners_Partner extends CubeIT_Form_SubForm {
         parent::init();
 
         $name = new Zend_Form_Element_Text('name');
-        $name->setLabel(__('Nom de partenaire'));
+        $name->setLabel(__('Nom du partenaire'));
         $this->addElement($name);
 
         $description = new Zend_Form_Element_Text('description');

diff --git a/framework/application/forms/CMS/Sub/Partners/Partners.php b/framework/application/forms/CMS/Sub/Partners/Partners.php
index bc38148dcbf8a38d732d83e60801d9bba953d11b..0cba183fd5e0a96b8b258c517e85da2d095d6853 100644 (file)
--- a/framework/application/forms/CMS/Sub/Partners/Partners.php
+++ b/framework/application/forms/CMS/Sub/Partners/Partners.php
@@ -2,11 +2,11 @@
 
 class Simeox_Form_CMS_Sub_Partners_Partners extends CubeIT_Form_Multi_SubForm {
 
-    public function init() {
-        parent::init();
-        $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Partners_Partner())
-            ->setBaseLegend('Edition de partenaire « $name »')
-            ->setNewLegend(__("Nouveau partenaire"));
-    }
+       public function init() {
+               parent::init();
+               $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Partners_Partner())
+                       ->setBaseLegend('Edition du partenaire « $name »')
+                       ->setNewLegend(__("Nouveau partenaire"));
+       }
 
 }
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/RDClinic.php b/framework/application/forms/CMS/Sub/RDClinic.php
index cdaf61b1f55f64f8bdee6f15edf72ffb89456d2e..7d6e3fd4d5942610e60c2062851252292296bc73 100644 (file)
--- a/framework/application/forms/CMS/Sub/RDClinic.php
+++ b/framework/application/forms/CMS/Sub/RDClinic.php
@@ -14,7 +14,7 @@ class Simeox_Form_CMS_Sub_RDClinic extends Simeox_Form_CMS_Sub_Section {
         $this->addElement($intro);
 
         $bg_image = new CubeIT_Form_Element_File_Image('bg_image_1');
-        $bg_image->setLabel(__("Image d'arrière-plan #1"));
+        $bg_image->setLabel(__("Image de fond #1"));
         $bg_image->setMaxItems(1);
         $this->addElement($bg_image);
 
@@ -23,7 +23,7 @@ class Simeox_Form_CMS_Sub_RDClinic extends Simeox_Form_CMS_Sub_Section {
         $this->addElement($findings);
 
         $bg_image_2 = new CubeIT_Form_Element_File_Image('bg_image_2');
-        $bg_image_2->setLabel(__("Image d'arrière-plan #2"));
+        $bg_image_2->setLabel(__("Image de fond #2"));
         $bg_image_2->setMaxItems(1);
         $this->addElement($bg_image_2);
 

diff --git a/framework/application/forms/CMS/Sub/Simeox.php b/framework/application/forms/CMS/Sub/Simeox.php
index 637f9351bd0d4f9c67df82d8f7741ff325ab694e..bb5c9cbe5c82dbbcf9bcbe4fb1bb9600d1db1a1c 100644 (file)
--- a/framework/application/forms/CMS/Sub/Simeox.php
+++ b/framework/application/forms/CMS/Sub/Simeox.php
@@ -10,7 +10,7 @@ class Simeox_Form_CMS_Sub_Simeox extends Simeox_Form_CMS_Sub_Section {
         $this->addSubForm($carousel, 'carousel');
 
         $operation = new Simeox_Form_CMS_Sub_Operation();
-        $operation->setLegend(__("Bloc 'Functionnement'"));
+        $operation->setLegend(__("Bloc 'Fonctionnement'"));
         $this->addSubForm($operation, 'operation');
 
         $benefits = new Simeox_Form_CMS_Sub_Benefits();

diff --git a/framework/application/forms/CMS/Sub/Team/Team.php b/framework/application/forms/CMS/Sub/Team/Team.php
index f3a543d43b37b357fd59eb312988c39caf570c0e..5fde002310ef15054799279393e03d7700553a8b 100644 (file)
--- a/framework/application/forms/CMS/Sub/Team/Team.php
+++ b/framework/application/forms/CMS/Sub/Team/Team.php
@@ -2,11 +2,11 @@
 
 class Simeox_Form_CMS_Sub_Team_Team extends CubeIT_Form_Multi_SubForm {
 
-    public function init() {
-        parent::init();
-        $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Team_Person())
-            ->setBaseLegend('Edition de « $name »')
-            ->setNewLegend(__("Nouveau membre d'équipe"));
-    }
+       public function init() {
+               parent::init();
+               $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Team_Person())
+                       ->setBaseLegend('Edition de « $name »')
+                       ->setNewLegend(__("Nouveau membre"));
+       }
 
 }
\ No newline at end of file

diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php
index c2c3180f6deb00ef17f5eabc7738ce66d334e7d7..7b0b5a697fb914b1a86c31dd29b1885cab3b093b 100644 (file)
--- a/framework/application/forms/Settings.php
+++ b/framework/application/forms/Settings.php
@@ -17,5 +17,3 @@ class Simeox_Form_Settings extends CubeIT_Form_Settings {
        }
 
 }
-
-?>