MAGETWO-46678: Process public PRs and Issues

- fixed public GitHub issue #2630
magento · Dec 17, 2015 · 66a6134 · 66a6134
1 parent b6ca8f1
commit 66a6134
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
@@ -27,7 +27,7 @@
                        data-validate="{required:true, 'validate-email':true}"
                        id="customer-email" />
                 <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
-                <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: "You can create an account after checkout."--><!-- /ko --></span>
+                <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko --></span>
             </div>
         </div>
 

diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
@@ -12,6 +12,13 @@
  */
 class Html extends AbstractAdapter
 {
+    /**
+     * Covers
+     * <span><!-- ko i18n: 'Next'--><!-- /ko --></span>
+     * <th class="col col-method" data-bind="i18n: 'Select Method'"></th>
+     */
+    const HTML_FILTER = "/i18n:\s?'(?<value>.*)'/i";
+
     /**
      * {@inheritdoc}
      */
@@ -34,5 +41,12 @@ protected function _parse()
                 $this->_addPhrase($quote . $directive[2] . $quote);
             }
         }
+
+        preg_match_all(self::HTML_FILTER, $data, $results, PREG_SET_ORDER);
+        for ($i = 0; $i < count($results); $i++) {
+            if (!empty($results[$i]['value'])) {
+                $this->_addPhrase($results[$i]['value']);
+            }
+        }
     }
 }