Merge remote-tracking branch 'remotes/api/MAGETWO-43612-Untranslatable-phrases-in-Magento-2' into API-Bug-PR

Cari Spruiell · Cari Spruiell · commit 62208fb82ccd · 2015-11-02T09:51:07.000-06:00
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -20,7 +20,7 @@
                     $storelist = $block->getStores();
                     foreach ($storelist as $_store):
                         ?>
-                        <th><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
+                        <th><?php /* @escapeNotVerified */ echo __($_store->getName()) ?></th>
                     <?php endforeach;
                     $storetotal = count($storelist) + 3;
                     ?>
diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
@@ -568,7 +568,9 @@ protected function _getFullInfo(array $keys, \Magento\Payment\Model\InfoInterfac
             }
             if (!empty($this->_paymentMapFull[$key]['value'])) {
                 if ($labelValuesOnly) {
-                    $result[$this->_paymentMapFull[$key]['label']] = $this->_paymentMapFull[$key]['value'];
+                    $value = $this->_paymentMapFull[$key]['value'];
+                    $value = is_array($value) ? array_map('__', $value) : __($value);
+                    $result[$this->_paymentMapFull[$key]['label']] = $value;
                 } else {
                     $result[$key] = $this->_paymentMapFull[$key];
                 }
diff --git a/app/code/Magento/Paypal/i18n/de_DE.csv b/app/code/Magento/Paypal/i18n/de_DE.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"
diff --git a/app/code/Magento/Paypal/i18n/es_ES.csv b/app/code/Magento/Paypal/i18n/es_ES.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"
diff --git a/app/code/Magento/Paypal/i18n/fr_FR.csv b/app/code/Magento/Paypal/i18n/fr_FR.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"
diff --git a/app/code/Magento/Paypal/i18n/nl_NL.csv b/app/code/Magento/Paypal/i18n/nl_NL.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"
diff --git a/app/code/Magento/Paypal/i18n/pt_BR.csv b/app/code/Magento/Paypal/i18n/pt_BR.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"
diff --git a/app/code/Magento/Paypal/i18n/zh_Hans_CN.csv b/app/code/Magento/Paypal/i18n/zh_Hans_CN.csv
@@ -687,3 +687,8 @@ Vendor,Vendor
 "Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
 "Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
 "PayPal Payment Solutions","PayPal Payment Solutions"
+verified,verified
+unverified,unverified
+Eligible,Eligible
+Ineligible,Inligible
+"PayPal Express Checkout","PayPal Express Checkout"

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,9 @@ protected function _getFullInfo(array $keys, \Magento\Payment\Model\InfoInterfac`
`568`	`568`	`}`
`569`	`569`	`if (!empty($this->_paymentMapFull[$key]['value'])) {`
`570`	`570`	`if ($labelValuesOnly) {`
`571`		`- $result[$this->_paymentMapFull[$key]['label']] = $this->_paymentMapFull[$key]['value'];`
	`571`	`+ $value = $this->_paymentMapFull[$key]['value'];`
	`572`	`+ $value = is_array($value) ? array_map('__', $value) : __($value);`
	`573`	`+ $result[$this->_paymentMapFull[$key]['label']] = $value;`
`572`	`574`	`} else {`
`573`	`575`	`$result[$key] = $this->_paymentMapFull[$key];`
`574`	`576`	`}`