lat9:
@gernot, if you find changes you need to make for Japanese support (other than the language-file changes), let me know and I'll see what notifications I can provide to make the integration easier!
Hello lat9,
Thanks for the heads-up, I am working on the installation preparations now, separating files that need overrides and so on.
I am using the master files, since I see you did some editing in the last few days.
One thing I cannot understand is, if I am using 1.5.6c, are the files in the zc156b sub-directory required or not.
In the documentation, you specifically request people to read for initial installation the following page:
https://github.com/lat9/one_page_checkout/blob/master/pages/install_upgrade_v210_or_later.md
Here there is not mention of 1.5.6c specifically, and I understand that the files in the zc156b sub-directory are already in Zen Cart 1.5.6c.
There are some differences though, so I wonder if they need to be merged or not.
For example, for one_page_checkout-master/zc156b/includes/classes/message_stack.php,
I get the following unified diff:
root@hase:/home/hase/Documents/ZenCart# diff -uw /<download path>/one_page_checkout-master/zc156b/includes/classes/message_stack.php /<local installation>/testshop/includes/classes/message_stack.php
--- /<download path>/one_page_checkout-master/zc156b/includes/classes/message_stack.php 2020-03-06 23:43:25.000000000 +0900
+++ /<local installation>/testshop/includes/classes/message_stack.php 2019-05-29 22:04:13.560135523 +0900
@@ -3,10 +3,10 @@
* messageStack Class.
*
* @package classes
- * @copyright Copyright 2003-2016 Zen Cart Development Team
+ * @copyright Copyright 2003-2019 Zen Cart Development Team
* @copyright Portions Copyright 2003 osCommerce
* @license [url]http://www.zen-cart.com/license/2_0.txt[/url] GNU Public License V2.0
- * @version $Id: Author: DrByte Sat Oct 17 22:52:38 2015 -0400 Modified in v1.5.5 $
+ * @version $Id: mc12345678 2019 Apr 30 Modified in v1.5.6b $
*/
if (!defined('IS_ADMIN_FLAG')) {
die('Illegal Access');
@@ -29,9 +29,6 @@
for ($i=0, $n=sizeof($messageToStack); $i<$n; $i++) {
$this->add($messageToStack[$i]['class'], $messageToStack[$i]['text'], $messageToStack[$i]['type']);
}
-/*-bof-checkout1-lat9 *** 1 of 2 *** Move to output function to allow messages to survive after header redirects
- $_SESSION['messageToStack']= '';
- -eof-checkout1-lat9 *** 1 of 2 *** */
}
}
@@ -62,7 +59,7 @@
function add_session($class, $message, $type = 'error') {
- if (!$_SESSION['messageToStack']) {
+ if (empty($_SESSION['messageToStack'])) {
$messageToStack = array();
} else {
$messageToStack = $_SESSION['messageToStack'];
@@ -80,9 +77,7 @@
function output($class) {
global $template, $current_page_base;
-//-bof-checkout1-lat9 *** 2 of 2 *** Once the messages are output, it's safe to clear any session-based messages
$_SESSION['messageToStack'] = '';
-//-eof-checkout1-lat9 *** 2 of 2 ***
$output = array();
for ($i=0, $n=sizeof($this->messages); $i<$n; $i++) {
@@ -110,4 +105,3 @@
}
}
-?>
```Essentially only one line ($_SESSION['messageToStack']= '';) that is different, but it looks critical.
Can you confirm whether I need to compare the zc156b files with the ones in Zen Cart 1.5.6c, or whether the files included in the 1.5.6c distribution make your zc156b files superfluous?
Zen Cart 1.5.6c modified for Japanese language support. Upgraded incrementally from initial 1.5.5d. Currently planning direct upgrade to 2.1.0
