Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 6299) +++ /controller/wpsg_AdminController.class.php (revision 6301) @@ -95,4 +95,15 @@ 'subTemplate' => WPSG_PATH_VIEW.'/admin/extended.phtml' ); + + if (function_exists('icl_object_id')) + { + + $this->shop->view['arSubAction']['wpml'] = array( + 'Menutext' => __('WPML Einstellungen', 'wpsg'), + 'subTemplate' => WPSG_PATH_VIEW.'/admin/wpml.phtml' + ); + + } + $this->shop->view['arSubAction']['presentation'] = array( 'Menutext' => __('Darstellung', 'wpsg'), @@ -821,5 +832,5 @@ if (wpsg_isSizedInt($form_data['id'])) { - + $this->db->UpdateQuery(WPSG_TBL_LAND, wpsg_q($form_data['country']), " `id` = '".wpsg_q($form_data['id'])."' "); $this->addBackendMessage(__('Land erfolgreich gespeichert.', 'wpsg')); @@ -834,4 +845,8 @@ } + $this->shop->addTranslationString('land_'.$form_data['id'], $form_data['country']['name']); + + //icl_register_string('wpsg', '', $form_data['country']['name']); + if (wpsg_isSizedInt($form_data['standard'])) $this->update_option('wpsg_defaultland', $form_data['id']); @@ -906,4 +921,57 @@ } // public function laenderAction() + public function wpmlAction() + { + + if (isset($_REQUEST['wpsg_set_string_translation'])) + { + + if (!function_exists('icl_register_string')) throw new \wpsg\Exception(__('WPML ist nicht komplett Installiert (Funktion icl_register_string ist nicht erreichbar)', 'wpsg')); + + // Alle Automatisch angelegten String-Übersetzungen löschen + $arStringTrans = $this->db->fetchAssocField("SELECT `id` FROM `".WPSG_TBL_WPML_ICL_STRINGS."` WHERE `context` = 'wpsg' AND `name` LIKE 'wpsg_auto_%' "); + + foreach ($arStringTrans as $st_id) + { + + // Löschen + $this->db->Query("DELETE FROM `".WPSG_TBL_WPML_ICL_STRING_PAGES."` WHERE `string_id` = '".wpsg_q($st_id)."' "); + $this->db->Query("DELETE FROM `".WPSG_TBL_WPML_ICL_STRING_POSITIONS."` WHERE `string_id` = '".wpsg_q($st_id)."' "); + $this->db->Query("DELETE FROM `".WPSG_TBL_WPML_ICL_STRING_TRANSLATIONS."` WHERE `string_id` = '".wpsg_q($st_id)."' "); + $this->db->Query("DELETE FROM `".WPSG_TBL_WPML_ICL_STRINGS."` WHERE `id` = '".wpsg_q($st_id)."' "); + + } + + // LÀndernamen + $arToTrans = $this->db->fetchAssocField("SELECT CONCAT('land_', `id`) AS `key`, `name` FROM `".WPSG_TBL_LAND."` ", "key", "name"); + + // Versandzonen + $arToTrans += $this->db->fetchAssocField("SELECT CONCAT('vz_', `id`) AS `key`, `name` FROM `".WPSG_TBL_VZ."` ", "key", "name"); + + // Auswahl der Anrede + $wpsg_admin_pflicht = $this->shop->get_option('wpsg_admin_pflicht'); + $arToTrans['anrede_auswahl'] = $wpsg_admin_pflicht['anrede_auswahl']; + + // Text Widerrufsmail + $arToTrans['wpsg_ps_mailwiderruf'] = $this->shop->get_option('wpsg_ps_mailwiderruf'); + + // Module + // TODO + + foreach ($arToTrans as $k => $t) + { + + icl_register_string('wpsg', 'wpsg_auto_'.$k, $t, false, 'de'); + + } + + $this->addBackendMessage(wpsg_translate(__('#1# Texte zur String-Übersetzung der Domain "wpsg" hinzugefÃŒgt.'), sizeof($arToTrans))); + + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=wpml'); + + } + + } // public function wpmlAction() + private function laenderList() { @@ -1012,6 +1080,5 @@ )); - $this->shop->addTranslationString('land_'.$land_id, $row['1']); - $this->shop->addTranslationString('landkrzl_'.$land_id, $row['2']); + $this->shop->addTranslationString('land_'.$land_id, $row['1']); } @@ -1600,5 +1667,5 @@ { - $this->shop->addTranslationString('anrede_auswahl', $v); + $this->shop->addTranslationString('anrede_auswahl', $v); } Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6299) +++ /controller/wpsg_ShopController.class.php (revision 6301) @@ -3071,70 +3071,82 @@ { - try - { - - if (file_exists(WPSG_PATH_TRANSLATION)) - { - - preg_match_all('/\$(.*)\040+\=\040+\_\_\(\'([^\']*)/i', file_get_contents(WPSG_PATH_TRANSLATION), $matches); - - if (@sizeof($matches[1]) != @sizeof($matches[2])) - { - - $this->addBackendError(__('Unerwarteter Fehler beim schreiben der Übersetzungsdatei.', 'wpsg')); - return; - - } - - $bDrin = false; - foreach ($matches[1] as $k => $m) - { - - if ($matches[1][$k] == $key) + if (function_exists('icl_register_string')) + { + + // WPML Version + icl_register_string('wpsg', 'wpsg_auto_'.$key, $value, false, 'de'); + + } + else + { + + try + { + + if (file_exists(WPSG_PATH_TRANSLATION)) + { + + preg_match_all('/\$(.*)\040+\=\040+\_\_\(\'([^\']*)/i', file_get_contents(WPSG_PATH_TRANSLATION), $matches); + + if (@sizeof($matches[1]) != @sizeof($matches[2])) { - $bDrin = true; - $matches[2][$k] = $value; + $this->addBackendError(__('Unerwarteter Fehler beim schreiben der Übersetzungsdatei.', 'wpsg')); + return; + + } + + $bDrin = false; + foreach ($matches[1] as $k => $m) + { + + if ($matches[1][$k] == $key) + { + + $bDrin = true; + $matches[2][$k] = $value; + + } } - } - - if (!$bDrin) - { - - $matches[1][] = $key; - $matches[2][] = $value; - - } - - $strFile = ''; - - foreach ($matches[1] as $k => $m) - { - - $strFile .= '$'.$matches[1][$k]." = __('".$matches[2][$k]."', 'wpsg');\r\n"; - - } - - @file_put_contents(WPSG_PATH_TRANSLATION, ""); - - } - else - { - - // Leere Datei erstellen - @file_put_contents(WPSG_PATH_TRANSLATION, ""); - - } - - } - catch (Exception $e) - { - - $this->addBackendError('nohspc_'.__('Sprachdatei konnte nicht geschrieben werden! Setzen Sie bitte Schreibrechte auf folgender Datei ÃŒberprÃŒfen:
'.WPSG_PATH_TRANSLATION.'', 'wpsg')); - - } - + if (!$bDrin) + { + + $matches[1][] = $key; + $matches[2][] = $value; + + } + + $strFile = ''; + + foreach ($matches[1] as $k => $m) + { + + $strFile .= '$'.$matches[1][$k]." = __('".$matches[2][$k]."', 'wpsg');\r\n"; + + } + + @file_put_contents(WPSG_PATH_TRANSLATION, ""); + + } + else + { + + // Leere Datei erstellen + @file_put_contents(WPSG_PATH_TRANSLATION, ""); + + } + + } + catch (Exception $e) + { + + $this->addBackendError('nohspc_'.__('Sprachdatei konnte nicht geschrieben werden! Setzen Sie bitte Schreibrechte auf folgender Datei ÃŒberprÃŒfen:
'.WPSG_PATH_TRANSLATION.'', 'wpsg')); + + } + + } + } // public function addTranslationString($key, $value) Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 6299) +++ /lib/functions.inc.php (revision 6301) @@ -84,5 +84,5 @@ * @param String $val */ - function wspg_isValidGeb(&$val) + function wpsg_isValidGeb(&$val) { @@ -90,5 +90,5 @@ else return false; - } // function wspg_isValidGeb($val) + } // function wpsg_isValidGeb($val) /** Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 6299) +++ /lib/helper_functions.inc.php (revision 6301) @@ -387,150 +387,5 @@ return $TC->render(WPSG_PATH_VIEW.'admin/form/checkbox.phtml', false); - - /* - $strReturn = ''; - - if (isset($conf['id'])) - { - - $field_id = $conf['id']; - - } - else - { - - $field_id = $field_name; - - } - - $att = ''; - - if (isset($conf['disabled']) && $conf['disabled'] === true) - { - - $att .= ' disabled="disabled" '; - - } - - if (!isset($conf['value'])) $value = '1'; else $value = $conf['value']; - - $tabindex = 0; - if (!wpsg_isSizedString($conf['tabindex'])) - { - - wpsg_addSet($GLOBALS['wpsg']['tabindex'], 1); - $tabindex = $GLOBALS['wpsg']['tabindex']; - - } - else - { - - $tabindex = $conf['tabindex']; - - } - - $att .= ' tabindex="'.$tabindex.'" '; - - if (isset($conf['fullrow']) && $conf['fullrow'] === true) - { - - $strReturn .= ' -
- - - '; - - if (isset($conf['help'])) - { - - $strReturn .= ''; - - } - - $strReturn .= ' -
-
- '; - - } - else if (isset($conf['labelright']) && $conf['labelright'] === true) - { - - $strReturn = ' -
-
 
-
- - - - '; - - if (isset($conf['help'])) - { - - $strReturn .= ''; - - } - - if (isset($conf['hint'])) - { - - if (substr($conf['hint'], 0, 7) == 'nohspc_') - $strReturn .= '

'.substr($conf['hint'], 7).'

'; - else - $strReturn .= '

'.wpsg_hspc($conf['hint']).'

'; - - } - - $strReturn .= ' -
-
-
- '; - - } - else - { - - $strReturn = ' -
-
- -
-
- - - '; - - if (isset($conf['help'])) - { - - $strReturn .= ''; - - } - - if (isset($conf['hint'])) - { - - if (substr($conf['hint'], 0, 7) == 'nohspc_') - $strReturn .= '

'.substr($conf['hint'], 7).'

'; - else - $strReturn .= '

'.wpsg_hspc($conf['hint']).'

'; - - } - - $strReturn .= ' -
-
-
- '; - - } - - return $strReturn; - */ + } // function wpsg_drawForm_Checkbox($field_name, $field_label, $conf = array()) Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 6299) +++ /lib/wpsg_basket.class.php (revision 6301) @@ -1179,6 +1179,6 @@ // Geburtsdatum if ( - ($custom_config['geb'] != '1' && !wspg_isValidGeb($this->arCheckout['geb'])) || - (wpsg_isSizedString($this->arCheckout['geb']) && !wspg_isValidGeb($this->arCheckout['geb'])) + ($custom_config['geb'] != '1' && !wpsg_isValidGeb($this->arCheckout['geb'])) || + (wpsg_isSizedString($this->arCheckout['geb']) && !wpsg_isValidGeb($this->arCheckout['geb'])) ) Index: /mods/wpsg_mod_request.class.php =================================================================== --- /mods/wpsg_mod_request.class.php (revision 6299) +++ /mods/wpsg_mod_request.class.php (revision 6301) @@ -538,9 +538,9 @@ } - //else if (array_key_exists($k, $required_fields) && $required_fields[$k] != 1 && $k === "geb" && !wspg_isValidGeb($v)) + //else if (array_key_exists($k, $required_fields) && $required_fields[$k] != 1 && $k === "geb" && !wpsg_isValidGeb($v)) else if ($k === "geb" && ( - ($required_fields[$k] != '1' && !wspg_isValidGeb($v)) || - (wpsg_isSizedString($v) && !wspg_isValidGeb($v)) + ($required_fields[$k] != '1' && !wpsg_isValidGeb($v)) || + (wpsg_isSizedString($v) && !wpsg_isValidGeb($v)) ) ) @@ -560,5 +560,5 @@ $_SESSION['wpsg']['wpsg_mod_request']['error'][] = 'email'; - $bOK = false; $this->shop->addFrontendError(__('Bitte die Eingabe der E-Mail Adresse ÃŒberprÃŒfen!', 'wspg')); + $bOK = false; $this->shop->addFrontendError(__('Bitte die Eingabe der E-Mail Adresse ÃŒberprÃŒfen!', 'wpsg')); } Index: /views/admin/wpml.phtml =================================================================== --- /views/admin/wpml.phtml (revision 6301) +++ /views/admin/wpml.phtml (revision 6301) @@ -0,0 +1,48 @@ + + +
+ +
+ + view['arSubAction'] as $k => $v) { ?> + + +
+ +
+ +
+
+ +
+
+

+
+
+ + + true)); ?> + +
*/ ?> + +

String-Übersetzung die Übersetzung von diesen Inhalten.', 'wpsg'); ?>

+ + + +
+
+ +
+
+ + Index: /views/mods/mod_produktartikel/produkt_edit_allgemein.phtml =================================================================== --- /views/mods/mod_produktartikel/produkt_edit_allgemein.phtml (revision 6299) +++ /views/mods/mod_produktartikel/produkt_edit_allgemein.phtml (revision 6301) @@ -10,8 +10,8 @@ get_option('wpsg_mod_produktartikel_ean'))) { ?> -view['data']['ean'], array('help' => 'wpsg_mod_produktartikel_ean')); ?> +view['data']['ean'], array('help' => 'wpsg_mod_produktartikel_ean')); ?> get_option('wpsg_mod_produktartikel_gtin'))) { ?> -view['data']['gtin'], array('help' => 'wpsg_mod_produktartikel_gtin')); ?> +view['data']['gtin'], array('help' => 'wpsg_mod_produktartikel_gtin')); ?> Index: /views/mods/mod_request/adminmail.phtml =================================================================== --- /views/mods/mod_request/adminmail.phtml (revision 6299) +++ /views/mods/mod_request/adminmail.phtml (revision 6301) @@ -11,5 +11,5 @@ - + : Index: /views/mods/mod_si/settings_edit.phtml =================================================================== --- /views/mods/mod_si/settings_edit.phtml (revision 6299) +++ /views/mods/mod_si/settings_edit.phtml (revision 6301) @@ -7,6 +7,6 @@ ?> -get_option('wpsg_mod_si_user_id'), array('help' => 'wpsg_mod_si_user_id')); ?> -get_option('wpsg_mod_si_project_id'), array('help' => 'wpsg_mod_si_project_id')); ?> +get_option('wpsg_mod_si_user_id'), array('help' => 'wpsg_mod_si_user_id')); ?> +get_option('wpsg_mod_si_project_id'), array('help' => 'wpsg_mod_si_project_id')); ?>
Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 6299) +++ /views/warenkorb/basket.phtml (revision 6301) @@ -10,5 +10,5 @@ //wpsg_debug(__('Deutschland', 'wpsg')); - + ?>
Index: /views/warenkorb/overview.phtml =================================================================== --- /views/warenkorb/overview.phtml (revision 6299) +++ /views/warenkorb/overview.phtml (revision 6301) @@ -156,5 +156,5 @@ } ?> - <?php echo wpsg_translate(__('Produktbilder von Produkte #1#', 'wspg'), $p['name']); ?> + <?php echo wpsg_translate(__('Produktbilder von Produkte #1#', 'wpsg'), $p['name']); ?> Index: /wpshopgermany.php =================================================================== --- /wpshopgermany.php (revision 6299) +++ /wpshopgermany.php (revision 6301) @@ -11,5 +11,7 @@ Author URI: http://maennchen1.de/ */ - error_reporting(E_ALL);ini_set("display_errors", "1"); + + //error_reporting(E_ALL); ini_set("display_errors", "1"); + define('WPSG_VERSION', '9.9.9'); @@ -62,5 +64,11 @@ define('WPSG_TBL_SCALEPRICE', $prefix.'wpsg_scaleprice'); define('WPSG_TBL_DELIVERYNOTE', $prefix.'wpsg_deliverynote'); - + + // WPML Tabellen + define('WPSG_TBL_WPML_ICL_STRINGS', $prefix.'icl_strings'); + define('WPSG_TBL_WPML_ICL_STRING_PAGES', $prefix.'icl_string_pages'); + define('WPSG_TBL_WPML_ICL_STRING_POSITIONS', $prefix.'icl_string_positions'); + define('WPSG_TBL_WPML_ICL_STRING_TRANSLATIONS', $prefix.'icl_string_translations'); + // Slug define('WPSG_FOLDERNAME', basename(dirname(__FILE__)));