From b98f3436ab8d4161694b1286dd292a33763a3eba Mon Sep 17 00:00:00 2001 From: Nikita Strelkov Date: Mon, 3 Oct 2016 06:25:04 +0500 Subject: [PATCH 1/5] Fix russian translation of SimpleFactory --- .../Creational/SimpleFactory/README.po | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po b/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po index 4d50b56..7355c01 100644 --- a/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po +++ b/locale/ru/LC_MESSAGES/Creational/SimpleFactory/README.po @@ -25,20 +25,23 @@ msgstr "SimpleFactory в примере ниже, это паттерн «Про #: ../../Creational/SimpleFactory/README.rst:9 msgid "" -"It differs from the static factory because it is NOT static and as you know:" -" static => global => evil!" +"It differs from the static factory because it is not static." msgstr "" "Она отличается от Статической Фабрики тем, что собственно *не является " -"статической*. Потому как вы должны знаеть: статическая => глобальная => зло!" +"статической*. Потому как вы должны понимать: статическая => глобальная => зло!" -#: ../../Creational/SimpleFactory/README.rst:12 +#: ../../Creational/SimpleFactory/README.rst:10 msgid "" -"Therefore, you can have multiple factories, differently parametrized, you " -"can subclass it and you can mock-up it." +"Therefore, you can have multiple factories, differently parametrized, you can subclass it and you can mock it." msgstr "" -"Таким образом, вы можете иметь несколько фабрик, параметризованных " -"различным образом. Вы можете унаследовать их и создавать макеты для " -"тестирования." +"Поэтому, вы можете иметь несколько фабрик, параметризованных различным " +"образом. Вы можете унаследовать их и создавать макеты для тестирования." + +#: ../../Creational/SimpleFactory/README.rst:11 +msgid "" +"It always should be preferred over a static factory!" +msgstr "" +"Простая фабрика всегда должна быть предпочтительнее статичной фабрики" #: ../../Creational/SimpleFactory/README.rst:16 msgid "UML Diagram" From f862fba24e8528e67b473c1d55ee1972e742cefd Mon Sep 17 00:00:00 2001 From: Nikita Strelkov Date: Mon, 3 Oct 2016 06:25:33 +0500 Subject: [PATCH 2/5] Move usage code exaple to single file and correctly include it This make code more structured and fix code highlighting problem --- Creational/SimpleFactory/README.rst | 8 ++++---- Creational/SimpleFactory/Usage/SimpleFactoryUsage.php | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 Creational/SimpleFactory/Usage/SimpleFactoryUsage.php diff --git a/Creational/SimpleFactory/README.rst b/Creational/SimpleFactory/README.rst index 3921b6f..0c3dd61 100644 --- a/Creational/SimpleFactory/README.rst +++ b/Creational/SimpleFactory/README.rst @@ -43,11 +43,11 @@ Bicycle.php Usage ----- -.. code:: php +Usage/SimpleFactoryUsage.php - $factory = new SimpleFactory(); - $bicycle = $factory->createBicycle(); - $bicycle->driveTo('Paris'); +.. literalinclude:: Usage/SimpleFactoryUsage.php + :language: php + :linenos: Test ---- diff --git a/Creational/SimpleFactory/Usage/SimpleFactoryUsage.php b/Creational/SimpleFactory/Usage/SimpleFactoryUsage.php new file mode 100644 index 0000000..9758ccf --- /dev/null +++ b/Creational/SimpleFactory/Usage/SimpleFactoryUsage.php @@ -0,0 +1,9 @@ +createBicycle(); +$bicycle->driveTo('Paris'); From f0938efeab7c9d52f51185d40fc2e5cc5b6da614 Mon Sep 17 00:00:00 2001 From: Nikita Strelkov Date: Mon, 3 Oct 2016 06:27:16 +0500 Subject: [PATCH 3/5] Fix namespaces mistakes --- Creational/Multiton/Tests/MultitonTest.php | 2 +- Creational/Prototype/Tests/PrototypeTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Creational/Multiton/Tests/MultitonTest.php b/Creational/Multiton/Tests/MultitonTest.php index dd0383f..0d0d292 100644 --- a/Creational/Multiton/Tests/MultitonTest.php +++ b/Creational/Multiton/Tests/MultitonTest.php @@ -1,6 +1,6 @@ Date: Mon, 3 Oct 2016 06:27:34 +0500 Subject: [PATCH 4/5] Fix indents for correct code highlighting --- Creational/FactoryMethod/README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Creational/FactoryMethod/README.rst b/Creational/FactoryMethod/README.rst index 3664631..6518719 100644 --- a/Creational/FactoryMethod/README.rst +++ b/Creational/FactoryMethod/README.rst @@ -64,11 +64,11 @@ CarFerrari.php :language: php :linenos: - Bicycle.php +Bicycle.php .. literalinclude:: Bicycle.php -:language: php - :linenos: + :language: php + :linenos: Test ---- From b182503514a849ecff2cff33654f5bd72bacb5bd Mon Sep 17 00:00:00 2001 From: Nikita Strelkov Date: Tue, 4 Oct 2016 13:13:34 +0500 Subject: [PATCH 5/5] Remove single file for SimpleFactory usage example And move code to code-block --- Creational/SimpleFactory/README.rst | 9 +++++---- Creational/SimpleFactory/Usage/SimpleFactoryUsage.php | 9 --------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 Creational/SimpleFactory/Usage/SimpleFactoryUsage.php diff --git a/Creational/SimpleFactory/README.rst b/Creational/SimpleFactory/README.rst index 0c3dd61..b1f0fbb 100644 --- a/Creational/SimpleFactory/README.rst +++ b/Creational/SimpleFactory/README.rst @@ -43,12 +43,13 @@ Bicycle.php Usage ----- -Usage/SimpleFactoryUsage.php - -.. literalinclude:: Usage/SimpleFactoryUsage.php - :language: php +.. code-block:: php :linenos: + $factory = new SimpleFactory(); + $bicycle = $factory->createBicycle(); + $bicycle->driveTo('Paris'); + Test ---- diff --git a/Creational/SimpleFactory/Usage/SimpleFactoryUsage.php b/Creational/SimpleFactory/Usage/SimpleFactoryUsage.php deleted file mode 100644 index 9758ccf..0000000 --- a/Creational/SimpleFactory/Usage/SimpleFactoryUsage.php +++ /dev/null @@ -1,9 +0,0 @@ -createBicycle(); -$bicycle->driveTo('Paris');