Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts: admin-dev/themes/default/template/controllers/customer_threads/message.tpl admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl admin-dev/themes/default/template/controllers/modules/favorites.tpl admin-dev/themes/default/template/controllers/modules/list.tpl admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl admin-dev/themes/default/template/controllers/orders/form.tpl admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl admin-dev/themes/default/template/controllers/products/associations.tpl admin-dev/themes/default/template/controllers/products/combinations.tpl admin-dev/themes/default/template/controllers/products/images.tpl admin-dev/themes/default/template/controllers/products/informations.tpl admin-dev/themes/default/template/controllers/products/prices.tpl admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl admin-dev/themes/default/template/header.tpl admin-dev/themes/default/template/helpers/form/form.tpl admin-dev/themes/default/template/helpers/list/list_header.tpl classes/ProductSale.php classes/helper/HelperList.php controllers/admin/AdminCmsController.php controllers/admin/AdminCustomersController.php controllers/admin/AdminMetaController.php controllers/admin/AdminModulesController.php controllers/admin/AdminPerformanceController.php controllers/admin/AdminProductsController.php controllers/front/ParentOrderController.php install-dev/theme/views/welcome.phtml modules/blocknewproducts/blocknewproducts.php modules/blocktopmenu/blocktopmenu.php modules/importerosc/importerosc.php modules/mailalerts/mailalerts.php modules/shopimporter/shopimporter.php modules/statsstock/statsstock.php themes/default/css/product_list.css
This commit is contained in:
Kevin Granger
+65
-35
@@ -36,51 +36,81 @@ function str2url(str, encoding, ucfirst)
|
||||
else
|
||||
{
|
||||
/* Lowercase */
|
||||
str = str.replace(/[\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u0101\u0103\u0105]/g, 'a');
|
||||
str = str.replace(/[\u00E7\u0107\u0109\u010D]/g, 'c');
|
||||
str = str.replace(/[\u010F\u0111]/g, 'd');
|
||||
str = str.replace(/[\u00E8\u00E9\u00EA\u00EB\u0113\u0115\u0117\u0119\u011B]/g, 'e');
|
||||
str = str.replace(/[\u011F\u0121\u0123]/g, 'g');
|
||||
str = str.replace(/[\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u0101\u0103\u0105\u0430]/g, 'a');
|
||||
str = str.replace(/[\u0431]/g, 'b');
|
||||
str = str.replace(/[\u00E7\u0107\u0109\u010D\u0446]/g, 'c');
|
||||
str = str.replace(/[\u010F\u0111\u0434]/g, 'd');
|
||||
str = str.replace(/[\u00E8\u00E9\u00EA\u00EB\u0113\u0115\u0117\u0119\u011B\u0435\u044D]/g, 'e');
|
||||
str = str.replace(/[\u0444]/g, 'f');
|
||||
str = str.replace(/[\u011F\u0121\u0123\u0433\u0491]/g, 'g');
|
||||
str = str.replace(/[\u0125\u0127]/g, 'h');
|
||||
str = str.replace(/[\u00EC\u00ED\u00EE\u00EF\u0129\u012B\u012D\u012F\u0131]/g, 'i');
|
||||
str = str.replace(/[\u0135]/g, 'j');
|
||||
str = str.replace(/[\u0137\u0138]/g, 'k');
|
||||
str = str.replace(/[\u013A\u013C\u013E\u0140\u0142]/g, 'l');
|
||||
str = str.replace(/[\u00F1\u0144\u0146\u0148\u0149\u014B]/g, 'n');
|
||||
str = str.replace(/[\u00F2\u00F3\u00F4\u00F5\u00F6\u00F8\u014D\u014F\u0151]/g, 'o');
|
||||
str = str.replace(/[\u0155\u0157\u0159]/g, 'r');
|
||||
str = str.replace(/[\u015B\u015D\u015F\u0161]/g, 's');
|
||||
str = str.replace(/[\u00EC\u00ED\u00EE\u00EF\u0129\u012B\u012D\u012F\u0131\u0438\u0456]/g, 'i');
|
||||
str = str.replace(/[\u0135\u0439]/g, 'j');
|
||||
str = str.replace(/[\u0137\u0138\u043A]/g, 'k');
|
||||
str = str.replace(/[\u013A\u013C\u013E\u0140\u0142\u043B]/g, 'l');
|
||||
str = str.replace(/[\u043C]/g, 'm');
|
||||
str = str.replace(/[\u00F1\u0144\u0146\u0148\u0149\u014B\u043D]/g, 'n');
|
||||
str = str.replace(/[\u00F2\u00F3\u00F4\u00F5\u00F6\u00F8\u014D\u014F\u0151\u043E]/g, 'o');
|
||||
str = str.replace(/[\u043F]/g, 'p');
|
||||
str = str.replace(/[\u0155\u0157\u0159\u0440]/g, 'r');
|
||||
str = str.replace(/[\u015B\u015D\u015F\u0161\u0441]/g, 's');
|
||||
str = str.replace(/[\u00DF]/g, 'ss');
|
||||
str = str.replace(/[\u0163\u0165\u0167]/g, 't');
|
||||
str = str.replace(/[\u00F9\u00FA\u00FB\u00FC\u0169\u016B\u016D\u016F\u0171\u0173]/g, 'u');
|
||||
str = str.replace(/[\u0163\u0165\u0167\u0442]/g, 't');
|
||||
str = str.replace(/[\u00F9\u00FA\u00FB\u00FC\u0169\u016B\u016D\u016F\u0171\u0173\u0443]/g, 'u');
|
||||
str = str.replace(/[\u0432]/g, 'v');
|
||||
str = str.replace(/[\u0175]/g, 'w');
|
||||
str = str.replace(/[\u00FF\u0177\u00FD]/g, 'y');
|
||||
str = str.replace(/[\u017A\u017C\u017E]/g, 'z');
|
||||
str = str.replace(/[\u00FF\u0177\u00FD\u044B]/g, 'y');
|
||||
str = str.replace(/[\u017A\u017C\u017E\u0437]/g, 'z');
|
||||
str = str.replace(/[\u00E6]/g, 'ae');
|
||||
str = str.replace(/[\u0447]/g, 'ch');
|
||||
str = str.replace(/[\u0445]/g, 'kh');
|
||||
str = str.replace(/[\u0153]/g, 'oe');
|
||||
str = str.replace(/[\u0448]/g, 'sh');
|
||||
str = str.replace(/[\u0449]/g, 'ssh');
|
||||
str = str.replace(/[\u044F]/g, 'ya');
|
||||
str = str.replace(/[\u0454]/g, 'ye');
|
||||
str = str.replace(/[\u0457]/g, 'yi');
|
||||
str = str.replace(/[\u0451]/g, 'yo');
|
||||
str = str.replace(/[\u044E]/g, 'yu');
|
||||
str = str.replace(/[\u0436]/g, 'zh');
|
||||
|
||||
/* Uppercase */
|
||||
str = str.replace(/[\u0100\u0102\u0104\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5]/g, 'A');
|
||||
str = str.replace(/[\u00C7\u0106\u0108\u010A\u010C]/g, 'C');
|
||||
str = str.replace(/[\u010E\u0110]/g, 'D');
|
||||
str = str.replace(/[\u00C8\u00C9\u00CA\u00CB\u0112\u0114\u0116\u0118\u011A]/g, 'E');
|
||||
str = str.replace(/[\u011C\u011E\u0120\u0122]/g, 'G');
|
||||
str = str.replace(/[\u0100\u0102\u0104\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u0410]/g, 'A');
|
||||
str = str.replace(/[\u0411]/g, 'B');
|
||||
str = str.replace(/[\u00C7\u0106\u0108\u010A\u010C\u0426]/g, 'C');
|
||||
str = str.replace(/[\u010E\u0110\u0414]/g, 'D');
|
||||
str = str.replace(/[\u00C8\u00C9\u00CA\u00CB\u0112\u0114\u0116\u0118\u011A\u0415\u042D]/g, 'E');
|
||||
str = str.replace(/[\u0424]/g, 'F');
|
||||
str = str.replace(/[\u011C\u011E\u0120\u0122\u0413\u0490]/g, 'G');
|
||||
str = str.replace(/[\u0124\u0126]/g, 'H');
|
||||
str = str.replace(/[\u0128\u012A\u012C\u012E\u0130]/g, 'I');
|
||||
str = str.replace(/[\u0134]/g, 'J');
|
||||
str = str.replace(/[\u0136]/g, 'K');
|
||||
str = str.replace(/[\u0139\u013B\u013D\u0139\u0141]/g, 'L');
|
||||
str = str.replace(/[\u00D1\u0143\u0145\u0147\u014A]/g, 'N');
|
||||
str = str.replace(/[\u00D3\u014C\u014E\u0150]/g, 'O');
|
||||
str = str.replace(/[\u0154\u0156\u0158]/g, 'R');
|
||||
str = str.replace(/[\u015A\u015C\u015E\u0160]/g, 'S');
|
||||
str = str.replace(/[\u0162\u0164\u0166]/g, 'T');
|
||||
str = str.replace(/[\u00D9\u00DA\u00DB\u00DC\u0168\u016A\u016C\u016E\u0170\u0172]/g, 'U');
|
||||
str = str.replace(/[\u0128\u012A\u012C\u012E\u0130\u0418\u0406]/g, 'I');
|
||||
str = str.replace(/[\u0134\u0419]/g, 'J');
|
||||
str = str.replace(/[\u0136\u041A]/g, 'K');
|
||||
str = str.replace(/[\u0139\u013B\u013D\u0139\u0141\u041B]/g, 'L');
|
||||
str = str.replace(/[\u041C]/g, 'M');
|
||||
str = str.replace(/[\u00D1\u0143\u0145\u0147\u014A\u041D]/g, 'N');
|
||||
str = str.replace(/[\u00D3\u014C\u014E\u0150\u041E]/g, 'O');
|
||||
str = str.replace(/[\u041F]/g, 'P');
|
||||
str = str.replace(/[\u0154\u0156\u0158\u0420]/g, 'R');
|
||||
str = str.replace(/[\u015A\u015C\u015E\u0160\u0421]/g, 'S');
|
||||
str = str.replace(/[\u0162\u0164\u0166\u0422]/g, 'T');
|
||||
str = str.replace(/[\u00D9\u00DA\u00DB\u00DC\u0168\u016A\u016C\u016E\u0170\u0172\u0423]/g, 'U');
|
||||
str = str.replace(/[\u0412]/g, 'V');
|
||||
str = str.replace(/[\u0174]/g, 'W');
|
||||
str = str.replace(/[\u0176]/g, 'Y');
|
||||
str = str.replace(/[\u0179\u017B\u017D]/g, 'Z');
|
||||
str = str.replace(/[\u0176\u042B]/g, 'Y');
|
||||
str = str.replace(/[\u0179\u017B\u017D\u0417]/g, 'Z');
|
||||
str = str.replace(/[\u00C6]/g, 'AE');
|
||||
str = str.replace(/[\u0427]/g, 'CH');
|
||||
str = str.replace(/[\u0425]/g, 'KH');
|
||||
str = str.replace(/[\u0152]/g, 'OE');
|
||||
str = str.replace(/[\u0428]/g, 'SH');
|
||||
str = str.replace(/[\u0429]/g, 'SHH');
|
||||
str = str.replace(/[\u042F]/g, 'YA');
|
||||
str = str.replace(/[\u0404]/g, 'YE');
|
||||
str = str.replace(/[\u0407]/g, 'YI');
|
||||
str = str.replace(/[\u0401]/g, 'YO');
|
||||
str = str.replace(/[\u042E]/g, 'YU');
|
||||
str = str.replace(/[\u0416]/g, 'ZH');
|
||||
|
||||
str = str.toLowerCase();
|
||||
|
||||
@@ -1107,4 +1137,4 @@ function sendBulkAction(form, action)
|
||||
$(form).attr('action', form_action.splice(form_action.lastIndexOf('&'), 0, '&' + action));
|
||||
|
||||
$(form).submit();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user