add typo fix, es translation, indentation and using before_install instead of before_script

cordoval · cordoval · commit 3287e5d20d9a · 2014-09-26T16:19:35.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - hhvm
+  - 5.3
+  - 5.4
+  - 5.5
+  - hhvm
 
 env:
   - SYMFONY_VERSION=2.5.*
@@ -21,7 +21,7 @@ matrix:
     - php: 5.5
       env: SYMFONY_VERSION=dev-master
 
-before_script:
+before_install:
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,7 +44,7 @@ Changelog
 ---------
 
 * **2013-08-04**: [Doctrine ORM] Fix doctrine orm compiler pass to match
-  signature of the one in the doctrine brigde.
+  signature of the one in the doctrine bridge.
 
 * **2013-08-01**: [PublishWorkflow] Adjusted interfaces to naming conventions.
   PublishableInterface is now read and write, PublishableReadInterface for read
diff --git a/CmfCoreBundle.php b/CmfCoreBundle.php
@@ -20,7 +20,6 @@ class CmfCoreBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
-        parent::build($container);
         $container->addCompilerPass(new RequestAwarePass());
         $container->addCompilerPass(new AddPublishedVotersPass());
     }
diff --git a/Doctrine/Phpcr/TranslatableMetadataListener.php b/Doctrine/Phpcr/TranslatableMetadataListener.php
@@ -16,7 +16,7 @@
 use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 
 /**
- * Metadata listener for when the translations is globally defined
+ * Metadata listener for when the translations are globally defined
  *
  * @author Lukas Kahwe Smith <smith@pooteeweet.org>
  */
diff --git a/Resources/translations/CmfCoreBundle.es.xliff b/Resources/translations/CmfCoreBundle.es.xliff
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="es" datatype="plaintext" original="file.ext">
+    <body>
+      <trans-unit id="form.group_publish_workflow">
+        <source>form.group_publish_workflow</source>
+        <target>Publica Flujo de Trabajo</target>
+      </trans-unit>
+      <trans-unit id="form.label_publishable">
+        <source>form.label_publishable</source>
+        <target>Publicable</target>
+      </trans-unit>
+      <trans-unit id="form.label_publish_start_date">
+        <source>form.label_publish_start_date</source>
+        <target>Fecha de inicio de Publicación</target>
+      </trans-unit>
+      <trans-unit id="form.label_publish_end_date">
+        <source>form.label_publish_end_date</source>
+        <target>Fecha de fin de Publicación</target>
+      </trans-unit>
+      <trans-unit id="form.label_locale">
+        <source>form.label_locale</source>
+        <target>Localización</target>
+      </trans-unit>
+      <trans-unit id="form.help_publish_start_date">
+        <source>form.help_publish_start_date</source>
+        <target>Sólo publica en esta fecha o después. Dejar vacío para publicar de inmediato.</target>
+      </trans-unit>
+      <trans-unit id="form.help_publish_end_date">
+        <source>form.help_publish_end_date</source>
+        <target>Sólo publica antes de esta fecha. Dejar vacío para no terminar la publicación.</target>
+      </trans-unit>
+      <trans-unit id="list.label_locales">
+        <source>list.label_locales</source>
+        <target>Lista de Localizaciones</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/Slugifier/SlugifierInterface.php b/Slugifier/SlugifierInterface.php
@@ -19,7 +19,7 @@
 interface SlugifierInterface
 {
     /**
-     * Return a slugified (or urlized) reperesentation of a given string
+     * Return a slugified (or urlized) representation of a given string
      *
      * @param string
      *
diff --git a/Tests/Functional/PublishWorkflow/PublishWorkflowTest.php b/Tests/Functional/PublishWorkflow/PublishWorkflowTest.php
@@ -29,11 +29,6 @@ class PublishWorkflowTest extends BaseTestCase
      */
     private $pwc;
 
-    /**
-     * @var CmfExtension
-     */
-    private $extension;
-
     public function setUp()
     {
         $this->pwc = $this->getContainer()->get('cmf_core.publish_workflow.checker');

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ class CmfCoreBundle extends Bundle`
`20`	`20`	`{`
`21`	`21`	`public function build(ContainerBuilder $container)`
`22`	`22`	`{`
`23`		`- parent::build($container);`
`24`	`23`	`$container->addCompilerPass(new RequestAwarePass());`
`25`	`24`	`$container->addCompilerPass(new AddPublishedVotersPass());`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * Metadata listener for when the translations is globally defined`
	`19`	`+ * Metadata listener for when the translations are globally defined`
`20`	`20`	`*`
`21`	`21`	`* @author Lukas Kahwe Smith <[email protected]>`
`22`	`22`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`interface SlugifierInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Return a slugified (or urlized) reperesentation of a given string`
	`22`	`+ * Return a slugified (or urlized) representation of a given string`
`23`	`23`	`*`
`24`	`24`	`* @param string`
`25`	`25`	`*`