Continued:

- 'gender' is only a social construct, let's support the 2-sexes reality here
  and not some woke ideology about "millions of genders"

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 0137eca427dc70555398cc3e1b586646b2716900..6df0d75adde60bbfe57358ce100abeaa67faa0f5 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -13,7 +13,7 @@
 ./inc/database-functions.php:1521:             // @TODO Rewrite these lines to a filter
 ./inc/database-functions.php:1545:     // @TODO Rewrite this to a filter
 ./inc/database-functions.php:1861:                     // @TODO Rewrite this to a filter
-./inc/database-functions.php:2029:                             // @TODO If the EL sub-system can support more than one parameter, this call_user_func_array() can be avoided
+./inc/database-functions.php:2029:                             // @TODO If the EL sub-system can support more than one parameter, this call_user_func_[] can be avoided
 ./inc/database-functions.php:2161:                     // @TODO Used generic 'userid' here
 ./inc/database-functions.php:2379:// @TODO cacheFiles is not yet supported
 ./inc/database-functions.php:39:// @TODO Can we cache this?
@@ -22,11 +22,6 @@
 ./inc/email-functions.php:204:// @TODO $rawUserId is currently unused
 ./inc/expression-functions.php:168:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:41:     // @TODO is escapeQuotes() enough for strings with single/double quotes?
-./inc/extensions-functions.php:2234:                   // @TODO Is this really neccessary?
-./inc/extensions-functions.php:2291:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
-./inc/extensions-functions.php:434:    // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
-./inc/extensions-functions.php:450:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:590:            // @TODO Extension is loaded, what next?
 ./inc/extensions/admins/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/autopurge/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/beg/mode-update.php:38:// @TODO Remove double tabs from all lines
@@ -43,6 +38,11 @@
 ./inc/extensions/ext-yoomedia.php:120:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready: setExtensionDeprecated('Y');
 ./inc/extensions/forced/mode-setup.php:38:// @TODO Remove double tabs from all lines
+./inc/extensions-functions.php:2234:                   // @TODO Is this really neccessary?
+./inc/extensions-functions.php:2291:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:434:    // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
+./inc/extensions-functions.php:450:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:590:            // @TODO Extension is loaded, what next?
 ./inc/extensions/grade/mode-setup.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/html_mail/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/network/mode-setup.php:13: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
@@ -91,13 +91,14 @@
 ./inc/extensions/transfer/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/user/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/user/mode-update.php:548:                             // @TODO Make configurable through web interface
-./inc/filter-functions.php:115:        // @TODO Remove this forced removal after a year or so
 ./inc/filter/blacklist_filter.php:105: // @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:116: // @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:127: // @TODO Insert log entry
 ./inc/filter/bonus_filter.php:56:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/filter/forced_filter.php:75:             // @TODO This part is unfinished
+./inc/filter-functions.php:115:        // @TODO Remove this forced removal after a year or so
 ./inc/filter/order_filter.php:132:             // @TODO 200 is hard-coded here, swap it out to config + admin_config_order.tpl
+./inc/filters.php:1379:                // @TODO No banner found, output some default banner
 ./inc/filter/user_filter.php:279:// @TODO 0% done
 ./inc/filter/user_filter.php:289:// @TODO 0% done
 ./inc/filter/wernis_filter.php:137:// @TODO 0% done
@@ -105,8 +106,6 @@
 ./inc/filter/wernis_filter.php:62:// @TODO 10% done
 ./inc/filter/wernis_filter.php:80:// @TODO 10% done
 ./inc/filter/wernis_filter.php:98:// @TODO 10% done
-./inc/filters.php:1379:                // @TODO No banner found, output some default banner
-./inc/gen_sql_patches.php:93:// @TODO Rewrite this to a filter
 ./inc/general-functions.php:1351:                      // @TODO Are these convertions still required?
 ./inc/general-functions.php:1372:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/general-functions.php:1676:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
@@ -115,12 +114,13 @@
 ./inc/general-functions.php:2335:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/general-functions.php:2685:// @TODO cacheFiles is not yet supported
 ./inc/general-functions.php:549:// @TODO $allowSpider is unused
+./inc/gen_sql_patches.php:93:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:166:       // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
 ./inc/install-functions.php:561:       // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
-./inc/language-functions.php:249:      // @TODO These are all valid languages, again hard-coded
 ./inc/language/de.php:1150:    // @TODO Rewrite these two constants
 ./inc/language/de.php:1166:    // @TODO Rewrite these three constants
 ./inc/language/de.php:46:      // @TODO Please sort these language elements
+./inc/language-functions.php:249:      // @TODO These are all valid languages, again hard-coded
 ./inc/language/install_de.php:155:     // @TODO Move this to e.g. ext-smtp
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
 ./inc/language/order_de.php:71:        // @TODO Find better text
@@ -199,12 +199,12 @@
 ./inc/modules/admin/what-list_rallye_prices.php:222:                   // @TODO Rewrite these two constants
 ./inc/modules/admin/what-list_refs.php:101:                                                    // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:115:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
+./inc/modules/admin/what-list_user_cats.php:54:                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_user_cats.php:74:                                // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_user.php:104:            // @TODO Refacture these old link generation to functions
 ./inc/modules/admin/what-list_user.php:121:            // @TODO Refacture birth_foo to avoid uni* timetstamps as older members cannot be greeded correctly
 ./inc/modules/admin/what-list_user.php:288:            // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:350:                    // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user_cats.php:54:                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-./inc/modules/admin/what-list_user_cats.php:74:                                // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-logs.php:64:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:70:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:124:                              // @TODO This can be somehow rewritten to a function
@@ -244,17 +244,17 @@
 ./inc/monthly/monthly_beg.php:53:      // @TODO Rewrite these if() blocks to a filter
 ./inc/monthly/monthly_bonus.php:52:    // @TODO Rewrite these if() blocks to a filter
 ./inc/pool-functions.php:39:// @TODO "Hook" ext-html_mail into this to allow column `html_msg`
-./inc/template-functions.php:1073:                             // @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
-./inc/template-functions.php:1128:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1139:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1261:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1316:             // @TODO Add a little more infos here
-./inc/template-functions.php:1715:// @TODO Lame description for this function
-./inc/template-functions.php:1737:                     // @TODO Move this in a filter
+./inc/template-functions.php:1079:                             // @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
+./inc/template-functions.php:1134:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1145:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1267:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1322:             // @TODO Add a little more infos here
+./inc/template-functions.php:1721:// @TODO Lame description for this function
+./inc/template-functions.php:1743:                     // @TODO Move this in a filter
 ./inc/template-functions.php:204:       * @TODO On some pages this is buggy
-./inc/template-functions.php:2514:     // @TODO Find a way to not use direct module comparison
+./inc/template-functions.php:2520:     // @TODO Find a way to not use direct module comparison
 ./inc/template-functions.php:297:      // @TODO Remove these sanity checks if all is fine
-./inc/template-functions.php:756:                      // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
+./inc/template-functions.php:762:                      // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
 ./inc/wrapper-functions.php:3293:      // @TODO Find a way to not use direct module comparison
 ./inc/wrapper-functions.php:596:// @TODO Do some more sanity check here
 ./inc/xml-functions.php:229:   // @TODO Handle characters
@@ -274,8 +274,8 @@
 ./templates/de/html/guest/guest_nickname_login.tpl:21: @TODO Deactivated feature, try to find a solution for this or remove it.
 ./templates/de/html/guest/guest_stats_member.tpl:21:   @TODO We have to fix these counters.
 ./templates/de/html/member/member_list_unconfirmed_nopoints.tpl:20:            <!-- @TODO Nothing to say here? //-->
-./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:             <!-- @TODO These are static lines and should be replaced by a filter (see ext-network/ext-sponsor) //-->
 ./templates/de/html/surfbar/surfbar_frameset.tpl:4:    // @TODO This redirect kills our own frameset
+./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:             <!-- @TODO These are static lines and should be replaced by a filter (see ext-network/ext-sponsor) //-->
 ./js/admin-network-query-api.js:67:// @TODO Add support for checkboxes
 ./js/admin-network-query-api.js:68:// @TODO Make progress window working
 ./js/ajax-common.js:245:                               // @TODO Need this be secured?
@@ -287,9 +287,10 @@
 ./.htaccess:17:        # @TODO When ext-terms is finished RewriteRule ^modules.php?module=index&what=agb$ modules.php?module=index&what=terms [L]
 ./.htaccess:18:        # @TODO When ext-terms is finished RewriteRule ^agb.php$ modules.php?module=index&what=terms [L]
 ### ### DEPRECATION FOLLOWS: ### ###
+./inc/classes/primera_api.class.php:2:// @DEPRECATED
 ./inc/modules/admin/admin-inc.php:539:// @DEPRECATED
 ./inc/mysql-connect.php:2:// @DEPRECATED
 ./inc/stylesheet.php:2:// @DEPRECATED
-./inc/template-functions.php:2452:// Removes comments with @DEPRECATED
-./inc/template-functions.php:2460:             // Is there a @DEPRECATED?
-./inc/template-functions.php:2461:             if (isInString('@DEPRECATED', $line)) {
+./inc/template-functions.php:2458:// Removes comments with @DEPRECATED
+./inc/template-functions.php:2466:             // Is there a @DEPRECATED?
+./inc/template-functions.php:2467:             if (isInString('@DEPRECATED', $line)) {

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 80f2b95c741a4f18adff4926b5d6c59692e81b38..4039b7cb660f5f8f4c06985d9935f3d812ff6613 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -59,7 +59,7 @@ $chk = bigintval(getRequestElement('check'), FALSE);
 $result = sqlQueryEscaped("SELECT
        `b`.`points`,
        `d`.`userid`,
-       `d`.`gender`,
+       `d`.`sex`,
        `d`.`surname`,
        `d`.`family`,
        `d`.`status`,

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 65a8acdbd61f17fe49aee8d6d6c0bc64a5e367ce..6b7711efff24b6a54149e20883be3b200cfd502d 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -526,7 +526,7 @@ function doExpressionJquery ($data) {
        } // END - if
 
        // Is there a value?
-       if ($data['callback'] == 'js') {
+       if (!empty($data['value'])) {
                // Then load special library
                $scriptName .= '-' . $data['value'];
        } // END - if

diff --git a/inc/extensions/bonus/mode-update.php b/inc/extensions/bonus/mode-update.php
index 2b5e6f6654b27181797777f12fb5022e3408e44f..b0c476e2326d71827a9013c022bd79d8016e776d 100644 (file)
--- a/inc/extensions/bonus/mode-update.php
+++ b/inc/extensions/bonus/mode-update.php
@@ -586,6 +586,3 @@ ORDER BY
                                setExtensionUpdateNotes("Filter zum Ausschließen des konfigurierten Mitgliedaccounts.");
                                break;
                } // END - switch
-
-// [EOF]
-?>

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index cda5aca543b1e78fbdf32da55877688a4d4033ce..e01541a4228f9dddeabdb7eb8cc39ae3c513662e 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.6.0');
+setThisExtensionVersion('0.6.1');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0'));
+setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1'));
 
 switch (getExtensionMode()) {
        case 'setup': // Do stuff when installation is running

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 1d74c88cf3bc861373a68b9b65d89976360a06bb..da137506f05c128070398dce3a6be8f1fb40831e 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.6.3');
+setThisExtensionVersion('0.6.4');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3'));
+setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');

diff --git a/inc/extensions/register/mode-update.php b/inc/extensions/register/mode-update.php
index be600f8ee4ab56febddc78a05a792ba4f1f0b389..9146ade029812e8b8176c81ffc362cf1c22146dc 100644 (file)
--- a/inc/extensions/register/mode-update.php
+++ b/inc/extensions/register/mode-update.php
@@ -368,7 +368,16 @@ PRIMARY KEY (`provider_id`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter für das Handling der Anmeldeanfragen hinzugeügt.");
                                break;
-               } // END - switch
 
-// [EOF]
-?>
+                       case '0.6.1': // SQL queries for v0.6.1
+                               // Register a filter
+                               registerFilter(__FILE__, __LINE__, 'register_must_fillout', 'REGISTER_MUST_FILLOUT', FALSE, TRUE, isExtensionDryRun());
+
+                               // Run these SQLs
+                               addExtensionSql("DELETE FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name` = 'gender'");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('sex','Y')");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("<code>gender</code> gegen <code>sex</code> ausgetauscht.");
+                               break;
+               } // END - switch

diff --git a/inc/extensions/sponsor/mode-setup.php b/inc/extensions/sponsor/mode-setup.php
index f2fe64195c96b6fe425964fe10abe11a0d9932a4..f0ff641c1df3c84c1330e977f2b0960bc45a49ac 100644 (file)
--- a/inc/extensions/sponsor/mode-setup.php
+++ b/inc/extensions/sponsor/mode-setup.php
@@ -48,7 +48,7 @@ if (!defined('__SECURITY')) {
 `company` VARCHAR(255) NOT NULL DEFAULT '',
 `position` VARCHAR(255) NOT NULL DEFAULT '',
 `tax_ident` VARCHAR(255) NOT NULL DEFAULT '',
-`gender` ENUM('M','F','C') NOT NULL DEFAULT 'M',
+`sex` ENUM('M','F','C') NOT NULL DEFAULT 'M',
 `surname` VARCHAR(255) NOT NULL DEFAULT '',
 `family` VARCHAR(255) NOT NULL DEFAULT '',
 `street_nr1` VARCHAR(255) NOT NULL DEFAULT '',
@@ -253,7 +253,7 @@ INDEX (`sponsor_id`)",
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('company','Y')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('position','N')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('tax_ident','N')");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('gender','N')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('sex','N')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('surname','N')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('family','N')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('street_nr1','Y')");

diff --git a/inc/extensions/user/mode-setup.php b/inc/extensions/user/mode-setup.php
index d00733f5c65111115b7c3bcf5a5d28dfa5bbc3e5..c3f7a3d0be8eac78b63d409b7d68bc281ce04dd5 100644 (file)
--- a/inc/extensions/user/mode-setup.php
+++ b/inc/extensions/user/mode-setup.php
@@ -70,7 +70,7 @@ addCreateTableSql('user_data', "
 `last_module` VARCHAR(255) NULL DEFAULT NULL,
 `ref_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `total_logins` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`gender` ENUM('M','F') NOT NULL DEFAULT 'M',
+`sex` ENUM('M','F') NOT NULL DEFAULT 'M',
 `used_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
 `emails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `joined` VARCHAR(10) NOT NULL DEFAULT 0,

diff --git a/inc/extensions/user/mode-update.php b/inc/extensions/user/mode-update.php
index 3b10d9d3bcb09832f3301b8450837f9d6d55fbb0..c6ec30534e8bda15c27f9dd0b16c66a046fa00bc 100644 (file)
--- a/inc/extensions/user/mode-update.php
+++ b/inc/extensions/user/mode-update.php
@@ -106,13 +106,6 @@ if (!defined('__SECURITY')) {
                                setExtensionUpdateNotes("User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt.");
                                break;
 
-                       case '0.2.2': // SQL queries for v0.2.2
-                               addExtensionChangeTableColumnSql('user_data', 'gender', 'gender', "ENUM('M','F','C') NOT NULL DEFAULT 'M'");
-
-                               // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Anrede "Firma" hinzugefügt.");
-                               break;
-
                        case '0.2.3': // SQL queries for v0.2.3
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Datumsformat festgelegt auf ausführlich.");
@@ -357,7 +350,7 @@ INDEX (`refid`)",
                        case '0.5.0': // SQL queries for v0.5.0
                                // Prefix for all test accounts
                                addConfigAddSql('tester_user_maximum', 'INT(5) UNSIGNED ZEROFILL NOT NULL DEFAULT 00999');
-                               addConfigAddSql('tester_user_gender', "ENUM('M','F') NOT NULL DEFAULT 'M'");
+                               addConfigAddSql('tester_user_sex', "ENUM('M','F') NOT NULL DEFAULT 'M'");
                                addConfigAddSql('tester_user_surname_prefix', "VARCHAR(255) NOT NULL DEFAULT 'tester_'");
                                addConfigAddSql('tester_user_family', "VARCHAR(255) NOT NULL DEFAULT 'Testbenutzer'");
                                addConfigAddSql('tester_user_street_nr', "VARCHAR(255) NOT NULL DEFAULT 'Teststraße 123'");
@@ -559,6 +552,13 @@ PRIMARY KEY (`provider_id`)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Spalten für Bestätigungszeitpunkt und IP-Adresse hinzugefügt.");
                                break;
+
+                       case '0.6.4': // SQL queries for v0.6.4
+                               addExtensionChangeTableColumnSql('user_data', 'gender', 'sex', "ENUM('M','F','C') NOT NULL DEFAULT 'M'");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Spalte <code>gender</code> nach <code>sex</code> umbenannt.");
+                               break;
                } // END - switch
 
 // [EOF]

diff --git a/inc/general-functions.php b/inc/general-functions.php
index 3520086ad3cee5cffd2b33b716755ca2b17c3b8e..8ede16413525f97f26e0f324bf7fe6ed98710dab 100644 (file)
--- a/inc/general-functions.php
+++ b/inc/general-functions.php
@@ -372,27 +372,27 @@ function translateComma ($dotted, $cut = TRUE, $max = '0') {
        return $translated;
 }
 
-// Translate Uni*-like gender to human-readable
-function translateGender ($gender) {
+// Translate Uni*-like sex to human-readable
+function translateSex ($sex) {
        // Default
-       $ret = '!' . $gender . '!';
+       $ret = '!' . $sex . '!';
 
        // Male/female or company?
-       switch ($gender) {
+       switch ($sex) {
                case 'M': // Male
                case 'F': // Female
                case 'C': // Company
                        // Use generic function
-                       $ret = translateGeneric('GENDER', $gender);
+                       $ret = translateGeneric('SEX', $sex);
                        break;
 
                default:
-                       // Please report bugs on unknown genders
-                       reportBug(__FUNCTION__, __LINE__, sprintf('Unknown gender %s detected.', $gender));
+                       // Please report bugs on unknown sexs
+                       reportBug(__FUNCTION__, __LINE__, sprintf('Unknown sex %s detected.', $sex));
                        break;
        } // END - switch
 
-       // Return translated gender
+       // Return translated sex
        return $ret;
 }
 

diff --git a/inc/language/de.php b/inc/language/de.php
index 4a0ad9c8ce1e16a2ea2de69c3abce737612592a1..2121aa1d83b4c9b221ece1ed34da31f105c000dd 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -460,7 +460,7 @@ addMessages(array(
        'ADMIN_WELCOME_BACK' => "Bitte beachten Sie beim nächsten Mal auf unsere AGBs, damit Ihnen diese Unangenehmlichkeiten erspart bleiben.",
        'ADMIN_DELETE_ACCOUNT' => "Löschung Ihres Accounts.",
        'ADMIN_DELETED_YOUR_ACCOUNT' => "Einer unserer Administratoren hat soeben Ihren Account gelöscht.",
-       'REASON_DELETE' => "Grund der Löschung war folgender",
+       'REASON_DELETE' => "Grund der Löschung war folsex",
        'ADMIN_BYE_BYE' => "Wir wünschen Ihnen weiterhin noch alles Gute und können Sie vielleicht irgentwann einmal wieder begruessen.",
        'ADMIN_ALL_CONFIRMED_EMAIL' => "Alle Ihre Mitglieder haben ihre Email-Adresse bestätigt! Keine Neuanmeldungen vorhanden.",
        'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet",
@@ -908,7 +908,7 @@ addMessages(array(
        '_UNUSED' => "Ungenutzt",
        'ADMIN_DELETED_MAILS_COUNT' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge gel&ouml;scht.",
        'EMAIL_DELETE_COUNT' => "Buchungseintr&auml;ge gel&ouml;scht",
-       'MAILER_HAS_DIED' => "{?TITLE?} ist in Script/Funktion <span class=\"data\">%s</span>, Zeile <span class=\"data\">%s</span> mit folgender Meldung abgebrochen: <span class=\"data\">%s</span>",
+       'MAILER_HAS_DIED' => "{?TITLE?} ist in Script/Funktion <span class=\"data\">%s</span>, Zeile <span class=\"data\">%s</span> mit folsex Meldung abgebrochen: <span class=\"data\">%s</span>",
        'ADMIN_MAIL_NOTHING_DELETED' => "Die Mail mit der Id <span class=\"data\">%s</span> weisst keine Mitglieder auf.",
        'ENTRY_ADDED' => "Eintrag hinzugef&uuml;gt",
        'UNLIMITED' => "Unbegrenzt",
@@ -1102,12 +1102,12 @@ addMessages(array(
        'TIME_UNIT_MINUTE'  => "Minute(n)",
        'TIME_UNIT_SECOND'  => "Sekunde(n)",
 
-       // Genders
-       'GENDER' => "Anrede",
-       'GENDER_UNKNOWN' => "Unbekannte Anrede %s erkannt.",
-       'GENDER_M' => "Herr",
-       'GENDER_F' => "Frau",
-       'GENDER_C' => "&quot;Firma&quot;",
+       // Sexes
+       'SEX' => "Anrede",
+       'SEX_UNKNOWN' => "Unbekannte Anrede %s erkannt.",
+       'SEX_M' => "Herr",
+       'SEX_F' => "Frau",
+       'SEX_C' => "&quot;Firma&quot;",
 
        // Login error messages
        'LOGIN_UNKNOWN_CODE' => "Unbekannter R&uuml;ckgabewert.",
@@ -1295,7 +1295,7 @@ addMessages(array(
        'ADMIN_ADD_POINTS_DATA_NOTICE' => "Achten Sie bei der Verwendung dieses Formulars darauf, dass der Verwendungszweck nicht mehrfach aufgef&uuml;hrt ist, sollte die eingegebene Tabellenspalte nicht existieren, wird sie automatisch angelegt. Sollte das Guthabenkonto wieder gel&ouml;scht werden, werden die dort angesammelten {?POINTS?} auf das eingestellbare Guthabenkonto (aktuell: <strong>{OPEN_TEMPLATE}config,translatePointsAccountType=points_remove_account{CLOSE_TEMPLATE}</strong> umgebucht. Es k&ouml;nnen mit diesem Formular nur benutzerdefinierte Guthabenkonten angelegt oder gel&ouml;scht werden, die Konten durch Erweiterungen angelegt sind dieses nicht.",
        'ADMIN_ADD_POINTS_DATA_SUBJECT_NOTICE' => "Der Verwendungszweck ist stets klein zu schreiben und sollte auch im Programmcode verwendet werden und muss mit dem ersten Parameter von den Funktionen <strong>addPointsThroughReferralSystem()</strong>, <strong>subtractPoints()</strong> und somit auch <strong>addBookingRecord()</strong> &uuml;bereinstimmen.",
        'ADMIN_ADD_POINTS_DATA_COLUMN_NAME_NOTICE' => "Die Tabellenspalte ist stets klein zu schreiben, ist diese in der Tabelle <strong>{?_MYSQL_PREFIX?}_user_points</strong> nicht vorhanden, wird diese plus der selbe Spaltenname mit dem Pr&auml;fix <strong>locked_</strong> automatisch dort erzeugt. Der Spaltenname sollte das Stichwort <strong>points</strong> enthalten und darf <strong><u>NIEMALS</u></strong> <strong>id</strong>, <strong>userid</strong> oder <strong>ref_depth</strong> heissen oder <strong>locked</strong> enthalten oder mit <strong>_ref</strong> enden.",
-       'ADMIN_ADD_POINTS_DATA_LOCKED_MODE_NOTICE' => "Bei der {?POINTS?}-Sperre werden dem Mitglied die {?POINTS?} auf sein so genanntes &quot;gesperrtes Guthaben&quot; gutgeschrieben. Auf dieses hat das Mitglied solange keinen Zugriff, bis es die Mindestanzahl zu best&auml;tigender Mails erreicht hat. Die Einstellung <strong>{--POINTS_LOCKED_MODE_LOCKED--}</strong> bewirkt, dass das Mitglied ebenfalls auf dieses Guthaben hinarbeiten muss. <strong>{--POINTS_LOCKED_MODE_UNLOCKED--}</strong> bewirkt hingegen, dass das Mitglied die Gutschrift sofort erh&auml;lt, ohne Mails best&auml;tigen zu m&uuml;ssen.",
+       'ADMIN_ADD_POINTS_DATA_LOCKED_MODE_NOTICE' => "Bei der {?POINTS?}-Sperre werden dem Mitglied die {?POINTS?} auf sein so genanntes &quot;gesperrtes Guthaben&quot; gutgeschrieben. Auf dieses hat das Mitglied solange keinen Zugriff, bis es die Mindestanzahl zu best&auml;tisex Mails erreicht hat. Die Einstellung <strong>{--POINTS_LOCKED_MODE_LOCKED--}</strong> bewirkt, dass das Mitglied ebenfalls auf dieses Guthaben hinarbeiten muss. <strong>{--POINTS_LOCKED_MODE_UNLOCKED--}</strong> bewirkt hingegen, dass das Mitglied die Gutschrift sofort erh&auml;lt, ohne Mails best&auml;tigen zu m&uuml;ssen.",
        'ADMIN_ADD_POINTS_DATA_PAYMENT_METHOD_NOTICE' => "Mit der Verg&uuml;tungsmethode k&ouml;nnen Sie beeinflussen, ob Ihre Mitglieder Referral-Gutschriften erhalten oder nur das eigentliche Mitglied (also das, was die Gutschrift erhalten soll) diese &quot;direkt&quot; gutgeschrieben werden soll. Stellen Sie dies z.B. beim Verwendungszweck <strong>mailid_okay</strong> auf &quot;{--POINTS_PAYMENT_METHOD_DIRECT--}&quot; um, erh&auml;lt das werbende Mitglied (das als Referral-Id eingetragen ist) keine Gutschriften bei der Mailbest&auml;tigung mehr. Seien Sie also auch mit dieser Einstellung nicht leichtsinnig.",
        'ADMIN_POINT_ACCOUNT_ADDED' => "Das Guthabenkonto wurde soeben angelegt. Bitte bauen Sie dies nun in Ihren PHP-Code ein.",
        'ADMIN_POINT_ACCOUNT_NOT_ADDED' => "Das Guthabenkonto konnte nicht angelegt werden. Vielleicht ist es bereits vorhanden oder von einer Erweiterung bereits angelegt?",

diff --git a/inc/language/user_de.php b/inc/language/user_de.php
index f3ec07e5563e9dd62d3d5a3cd58db6f99525fb60..3c58a8e507290cc87959ac50f911d345124f887e 100644 (file)
--- a/inc/language/user_de.php
+++ b/inc/language/user_de.php
@@ -83,7 +83,7 @@ addMessages(array(
        // Tester user accounts:
        // - Configuration
        'ADMIN_CONFIG_TESTER_USER_MAXIMUM' => "Grösster Suffix für Testbenutzer:",
-       'ADMIN_CONFIG_TESTER_USER_GENDER' => "Anrede:",
+       'ADMIN_CONFIG_TESTER_USER_SEX' => "Anrede:",
        'ADMIN_CONFIG_TESTER_USER_SURNAME_PREFIX' => "Präfix für Testbenutzer:",
        'ADMIN_CONFIG_TESTER_USER_FAMILY' => "Nachname:",
        'ADMIN_CONFIG_TESTER_USER_STREET_NR' => "Straße + Hausnummer:",
@@ -99,7 +99,7 @@ addMessages(array(
        'ADMIN_ADD_TESTER_USER_NOTICE' => "Es sind bereits <span class=\"data\">{OPEN_TEMPLATE}pipe,getTotalTesterUsers,translateComma{CLOSE_TEMPLATE}</span> von maximal <span class=\"data\">{OPEN_TEMPLATE}config,translateComma=tester_user_maximum{CLOSE_TEMPLATE}</span> Testbenutzern angelegt.",
        'ADMIN_ADD_TESTER_USER_TITLE' => "Neuen Testbenutzer anlegen",
        'ADMIN_ADD_TESTER_USER_SUBMIT' => "Testbenutzer anlegen",
-       'ADMIN_ADD_TESTER_USER_GENDER' => "Anrede ausw&auml;hlen:",
+       'ADMIN_ADD_TESTER_USER_SEX' => "Anrede ausw&auml;hlen:",
        'ADMIN_ADD_TESTER_USER_SURNAME' => "Vorname (<strong>NICHT SP&Auml;TER &Auml;NDERN!</strong>):",
        'ADMIN_ADD_TESTER_USER_FAMILY' => "Nachname eingeben:",
        'ADMIN_ADD_TESTER_USER_STREET_NR' => "Stra&szlig;e + Hausnummer eingeben:",

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 8a6ef504c3104fe78b8af54a63db7ab0bc107c8b..7135f90ac2f7ed924c3dc1397f2c5bd22527827e 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -610,7 +610,7 @@ function getReferralRallyeUserDataFromArray ($userIds) {
 
        // Load users
        $result = sqlQueryEscaped("SELECT
-       `userid`, `gender`, `surname`, `family`, `email`
+       `userid`, `sex`, `surname`, `family`, `email`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -626,8 +626,8 @@ LIMIT %s",
                ), __FUNCTION__, __LINE__);
        while ($content = sqlFetchArray($result)) {
                // Construct the message masked and add it
-               $ret .= sprintf("{%%pipe,translateGender=%s%} %s %s (%s) - %s\n",
-                       $content['gender'],
+               $ret .= sprintf("{%%pipe,translateSex=%s%} %s %s (%s) - %s\n",
+                       $content['sex'],
                        $content['surname'],
                        $content['family'],
                        $content['email'],
@@ -642,11 +642,11 @@ LIMIT %s",
 //
 function getArrayFromReferralRallyePrices ($rallye) {
        // Init multi array
-       $prices = array(
+       $prices = [
                'level'  => [],
                'points' => [],
-               'info'   => []
-       );
+               'info'   => [],
+       ];
 
        // Load prices
        $result = sqlQueryEscaped("SELECT

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 3c9d42810c23048d0cd8b16f9a66927b00438ddb..215cf54410f3f12c01ec4781fb7e432731a53daa 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -340,7 +340,7 @@ function doGenericUserRegistration () {
        sqlQueryEscaped("INSERT INTO
        `{?_MYSQL_PREFIX?}_user_data`
 (
-       `gender`,
+       `sex`,
        `surname`,
        `family`,
        `street_nr`,
@@ -388,7 +388,7 @@ function doGenericUserRegistration () {
 )",
        array(
                $GLOBALS['register_country_row'],
-               substr(postRequestElement('gender'), 0, 1),
+               substr(postRequestElement('sex'), 0, 1),
                postRequestElement('surname'),
                postRequestElement('family'),
                postRequestElement('street_nr'),
@@ -479,7 +479,7 @@ function doGenericUserRegistration () {
                $content = array(
                        'hash'     => $GLOBALS['register_confirm_hash'],
                        'userid'   => $filterData['register_insert_id'],
-                       'gender'   => sqlEscapeString(postRequestElement('gender')),
+                       'sex'   => sqlEscapeString(postRequestElement('sex')),
                        'surname'  => sqlEscapeString(postRequestElement('surname')),
                        'family'   => sqlEscapeString(postRequestElement('family')),
                        'email'    => sqlEscapeString(postRequestElement('email')),
@@ -495,7 +495,7 @@ function doGenericUserRegistration () {
                $content = array(
                        'hash'     => $GLOBALS['register_confirm_hash'],
                        'userid'   => $filterData['register_insert_id'],
-                       'gender'   => sqlEscapeString(postRequestElement('gender')),
+                       'sex'   => sqlEscapeString(postRequestElement('sex')),
                        'surname'  => sqlEscapeString(postRequestElement('surname')),
                        'family'   => sqlEscapeString(postRequestElement('family')),
                        'email'    => sqlEscapeString(postRequestElement('email')),

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 07c71ce74169aace4be92cfbf7d6e64e03abc01d..99b5770f323a40aa25b4e2450231867dbe4e4206 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -1004,7 +1004,7 @@ function doDisplayGenericUserRegistrationForm () {
        } // END - if
 
        // Other values
-       foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) {
+       foreach (['sex', 'surname', 'family', 'street_nr', 'city', 'email'] as $entry) {
                $content[$entry] = sqlEscapeString(postRequestElement($entry));
        } // END - foreach
 
@@ -1177,12 +1177,12 @@ function getTesterUserCheckCat () {
        return $GLOBALS[__FUNCTION__];
 }
 
-// Getter for tester_user_gender
-function getTesterUserGender () {
+// Getter for tester_user_sex
+function getTesterUserSex () {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
-               $GLOBALS[__FUNCTION__] = getConfig('tester_user_gender');
+               $GLOBALS[__FUNCTION__] = getConfig('tester_user_sex');
        } // END - if
 
        // Return cache

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index aa3c207613fa97833665952b2d316d91b301ce94..c9fe0da434ea4cb7b4f0fdbc3ddd449d02338e20 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -650,7 +650,7 @@ function doWernisFinishUserRegistration ($challenge, $challengeResponse, $status
                        $return['mapped_data'] = runFilterChain('register_must_fillout', $return['mapped_data']);
 
                        // Add missing elements
-                       $return['mapped_data']['gender']               = NULL;
+                       $return['mapped_data']['sex']               = NULL;
                        $return['mapped_data']['birthday_selection']   = generateDayMonthYearSelectionBox($return['mapped_data']['birth_day'], $return['mapped_data']['birth_month'], $return['mapped_data']['birth_year']);
                        $return['mapped_data']['challenge']            = getRequestElement('challenge');
                        $return['mapped_data']['__challenge_response'] = getRequestElement('__challenge_response');

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 560b2fa459efd5d732bd3f6e58969f0b1f7750be..6841761fa3533ba4390bd081967f87dbf2c9f3d7 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -188,7 +188,7 @@ LIMIT 1",
                                                $content = getUserDataArray();
 
                                                // Generate HTML list entry
-                                               $add = '<li>{--ADMIN_ASSIGNED_USERID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
+                                               $add = '<li>{--ADMIN_ASSIGNED_USERID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateSex=' . $content['sex'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
                                        } else {
                                                // Invalid userid, so log and zero it
                                                logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.');

diff --git a/inc/modules/admin/what-config_user.php b/inc/modules/admin/what-config_user.php
index 2aab492b3e6b521fc4f1fdfbe6c45aba8b02ef29..ea85a65978e3210f90347cec306042f8c4758307 100644 (file)
--- a/inc/modules/admin/what-config_user.php
+++ b/inc/modules/admin/what-config_user.php
@@ -47,8 +47,8 @@ if (isFormSent('save_config')) {
        // Save settings
        adminSaveSettingsFromPostData();
 } else {
-       // Prepare gender selection box
-       $content['tester_user_gender_selection'] = generateGenderSelectionBox(getTesterUserGender(), 'tester_user_gender');
+       // Prepare sex selection box
+       $content['tester_user_sex_selection'] = generateSexSelectionBox(getTesterUserSex(), 'tester_user_sex');
 
        // Load form template
        loadTemplate('admin_config_user', FALSE, $content);

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index 5c45bbe94b3bd9a077f7ffa9d6710e906af43dc5..9f42b0e5841bee2c48f27e5513a7fc449cd0e079 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isGetRequestElementSet('id')) {
        // Check for selected sponsor
-       $result = sqlQueryEscaped("SELECT `id`, `email`, `gender`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `id`, `email`, `sex`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
        if (sqlNumRows($result) == 1) {
                // Remove sponsor

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 88a4e1000c4d7d3c1852633a527c1c2e2ccb0d59..455d3c7fa6d727b5283671bfe514e70a0e6404ce 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__);
 if ((isGetRequestElementSet('id')) && (isGetRequestElementSet('do'))) {
        // Check for selected sponsor
        $result_main = sqlQueryEscaped("SELECT
-       `id`, `company`, `position`, `gender`, `surname`, `family`,
+       `id`, `company`, `position`, `sex`, `surname`, `family`,
        `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
        `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`,
        `receive_warnings`, `warning_interval`
@@ -138,7 +138,7 @@ LIMIT 1",
                                        handleSponsorRequest(postRequestArray());
 
                                        // Convert some data for the email template
-                                       postRequestElement('gender'          , '{%pipe,translateGender=' . postRequestElement('gender') . '%}');
+                                       postRequestElement('sex'          , '{%pipe,translateSex=' . postRequestElement('sex') . '%}');
                                        postRequestElement('warning_interval', '{%pipe,createFancyTime=' . postRequestElement('warning_interval') . '%}');
 
                                        if ($PASS === FALSE) setPostRequestElement('password1', '{--SPONSOR_PASS_UNCHANGED--}');

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index b0f65e09eb2a936230e43418a5a2d9c56cd159a7..2d5128f9e3d3e31cd211e693668ba3edf30675c8 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -50,7 +50,7 @@ $result_main = FALSE;
 if (isGetRequestElementSet('userid')) {
        // Load user entry
        $result_main = sqlQueryEscaped("SELECT
-       `userid`, `gender`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`,
+       `userid`, `sex`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`,
        `email`,
        `birth_day`, `birth_month`, `birth_year`,
        `max_mails`
@@ -86,7 +86,7 @@ if ((!isGetRequestElementSet('userid')) || (sqlNumRows($result_main) == 1)) {
                        sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `gender`='%s',
+       `sex`='%s',
        `surname`='%s',
        `family`='%s',
        `street_nr`='%s',
@@ -99,7 +99,7 @@ WHERE
        `userid`=%s
 LIMIT 1",
                        array(
-                               substr(postRequestElement('gender'), 0, 1),
+                               substr(postRequestElement('sex'), 0, 1),
                                postRequestElement('surname'),
                                postRequestElement('family'),
                                postRequestElement('street_nr'),

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 966e58b751616678dc9aa2c9cde78b158ea6e4b7..2aec94b1201d45fef5d5b17f2a80b095d5884fbe 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -54,7 +54,7 @@ if (isFilledArray($excludedUserids)) {
 // Check for all accounts
 $result = sqlQuery("SELECT
        `d`.`userid`,
-       `d`.`gender`,
+       `d`.`sex`,
        `d`.`surname`,
        `d`.`family`,
        `d`.`email`,
@@ -79,7 +79,7 @@ if (!ifSqlHasZeroNumRows($result)) {
                // Prepare data for the row template
                $content = array(
                        'userid'      => $content['userid'],
-                       'gender'      => $content['gender'],
+                       'sex'      => $content['sex'],
                        'surname'     => $content['surname'],
                        'family'      => $content['family'],
                        'email'       => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>',

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 82d1bb9aef483b4e57d2ad70bdc0a9945cf6420c..931d2ea2d2479a96b82274467f1c1d31d4774786 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -171,7 +171,7 @@ LIMIT 1",
                                $content = array(
                                        'task' => $taskId,
                                        'pid'  => bigintval(getRequestElement('pid')),
-                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
+                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateSex=' . getUserData('sex') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
                                );
 
                                // Load template
@@ -202,7 +202,7 @@ LIMIT 1",
                                $content = array(
                                        'task' => $taskId,
                                        'pid'  => bigintval(getRequestElement('pid')),
-                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
+                                       'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateSex=' . getUserData('sex') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
                                );
 
                                // Load template

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 3184a790f70eeffb1b8d2601425a9906d4390b38..ca6488743674bc0df580081b45cf77b469055e05 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__);
 if (isGetRequestElementSet('id')) {
        // Show detailed informations to a sponsor
        $result = sqlQueryEscaped("SELECT
-       `company`, `position`, `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+       `company`, `position`, `sex`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
        `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`,
        `status`,
        UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
@@ -101,7 +101,7 @@ WHERE
                // Sponsor found so let's list all his referrals
                $result = sqlQueryEscaped("SELECT
        `id`,
-       `gender`,
+       `sex`,
        `surname`,
        `family`,
        `email`,
@@ -135,7 +135,7 @@ ORDER BY
 } else {
        // List all sponsors
        $result_main = sqlQuery("SELECT
-       `id`, `gender`, `surname`, `family`, `email`, `status`,
+       `id`, `sex`, `surname`, `family`, `email`, `status`,
        UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
        UNIX_TIMESTAMP(`last_online`) AS `last_online`,
        `points_amount`, `points_used`,

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 13a29cc9f576f2deedc3a77af530f0f4b4f7e403..5e4f9f5db0031b54c9ec36709a877aca3f6ca08b 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -144,7 +144,7 @@ if (($listed === TRUE) && (!empty($sql))) {
        `u`.`status`,
        `u`.`surname`,
        `u`.`family`,
-       `u`.`gender`,
+       `u`.`sex`,
        `u`.`email`
 FROM
        `{?_MYSQL_PREFIX?}_user_links` AS `l`
@@ -175,7 +175,7 @@ LIMIT %s",
                                                'userid' => $row['userid'],
                                                'type'   => getRequestElement('type'),
                                                'id'     => $ID,
-                                               'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
+                                               'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateSex=' . $row['sex'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
                                                'status' => $row['status'],
                                        );
 

diff --git a/inc/modules/admin/what-list_user_cats.php b/inc/modules/admin/what-list_user_cats.php
index a6d6ad3efd11477a359c37915dbd466b4ab3ccbb..cb254c1c541cefe4a8fc4fce98ef7b9dd07a861e 100644 (file)
--- a/inc/modules/admin/what-list_user_cats.php
+++ b/inc/modules/admin/what-list_user_cats.php
@@ -52,7 +52,7 @@ if (isGetRequestElementSet('userid')) {
 
                // Prepare constants
                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-               $content['email']  = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>';
+               $content['email']  = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateSex=' . $content['sex'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                // Ok, list categories of this user
                $result_cats = sqlQuery("SELECT

diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index d5aa03d51a46ceb17b690ab388b9f6281ba5d853..d037477d15b760569bbb08b7749ec89205ad9197 100644 (file)
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -46,7 +46,7 @@ $message = '';
 
 if (isGetRequestElementSet('id')) {
        // Check for selected sponsor
-       $result_sponsor = sqlQueryEscaped("SELECT `gender`, `surname`, `family`, `email`, `status` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1",
+       $result_sponsor = sqlQueryEscaped("SELECT `sex`, `surname`, `family`, `email`, `status` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
        if (sqlNumRows($result_sponsor) == 1) {
                // Get sponsor's current status and let only confirmed and locked status pass
@@ -96,7 +96,7 @@ if (isGetRequestElementSet('id')) {
                                }
 
                                // Create email link
-                               $content['email_link'] = '<a href="' . generateEmailLink($content['email'], 'sponsor_data') . '">' . $content['gender'] . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';
+                               $content['email_link'] = '<a href="' . generateEmailLink($content['email'], 'sponsor_data') . '">' . $content['sex'] . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                                // Display form
                                loadTemplate('admin_lock_sponsor', FALSE, $content);

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 428c46824ab0df3d19a375bb6a6f404cfbffdcaf..5e811f1e8ca44768b35981e503bba85758010c56 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -57,7 +57,7 @@ if (isFormSent()) {
 
                        // Load his personal data
                        $result_main = sqlQueryEscaped("SELECT
-       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+       `id`, `sex`, `surname`, `family`, `email`, `remote_addr`,
        UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
        `points_amount`, `points_used`,
        (`points_amount` + `points_used`) AS `points`,
@@ -164,7 +164,7 @@ LIMIT 1",
                                        // Load referral's data
                                        $result = sqlQueryEscaped("SELECT
        `id`,
-       `gender`,
+       `sex`,
        `surname`,
        `family`,
        `email`,
@@ -203,7 +203,7 @@ LIMIT 1",
 
 // Begin listing of all pending sponsor accounts
 $result = sqlQuery("SELECT
-       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+       `id`, `sex`, `surname`, `family`, `email`, `remote_addr`,
        UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 4228bd3cf08bd7de2ccb92ecec62454cef071afd..feb51ef794bcb67cb7b8c613a1b5578ef52afbbb 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -59,7 +59,7 @@ if (isGetRequestElementSet('do')) {
 if (isGetRequestElementSet('hash')) {
        // Lookup sponsor
        $result = sqlQueryEscaped("SELECT
-       `id`, `status`, `gender`, `surname`, `family`,
+       `id`, `status`, `sex`, `surname`, `family`,
        `company`, `position`, `tax_ident`,
        `street_nr1`, `street_nr2`, `country`, `zip`, `city`, `email`, `phone`, `fax`, `cell`,
        `points_amount` AS `points`, `last_payment`, `last_currency`
@@ -155,7 +155,7 @@ LIMIT 1",
        `hash`,
        `status`,
        `remote_addr`,
-       `gender`,
+       `sex`,
        `surname`,
        `family`,
        UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
@@ -211,7 +211,7 @@ LIMIT 1",
        `id`,
        `hash`,
        `remote_addr`,
-       `gender`,
+       `sex`,
        `surname`,
        `family`,
        UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 3c3313ee7a78f35e2e893d182ccd69aa359330f0..ba371e625b87ce2abe4256331ae99e2f81e8bfa5 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -51,9 +51,9 @@ if (isFormSent()) {
        // Check submitted form data
        //
        // 1. Salutation / Surname / family name
-       if (!isPostRequestElementSet('gender')) {
+       if (!isPostRequestElementSet('sex')) {
                // Surname is empty
-               array_push($formErrors, '{--SPONSOR_NO_GENDER_SELECTED--}');
+               array_push($formErrors, '{--SPONSOR_NO_SEX_SELECTED--}');
        } // END - if
 
        if (!isPostRequestElementSet('surname')) {
@@ -254,7 +254,7 @@ ORDER BY
                $content['payment_list'] = loadTemplate('guest_sponsor_payment', TRUE, $OUT);
 
                // Init a lot array elements
-               foreach (array('company','position','tax_ident','gender_m','gender_f','gender_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) {
+               foreach (array('company','position','tax_ident','sex_m','sex_f','sex_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) {
                        $content[$entry]   = '';
                } // END - foreach
 

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 33a31d53ffe4f6e77df6f2819acce4dd91b92b0a..87faedd8a9445b5be8c23636f339189afc8cac8a 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -79,8 +79,8 @@ $ltitle = '{--GUEST_STATS_' . $lmode . '--}';
 switch (strtoupper($do)) {
        case 'MEMBERS': // Statistics about your members
                // Only males / females
-               $male   = countSumTotalData('M', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
-               $female = countSumTotalData('F', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $male   = countSumTotalData('M', 'user_data', 'userid', 'sex', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $female = countSumTotalData('F', 'user_data', 'userid', 'sex', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
 
                // List every month
                $months = [];

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 1cacc010b591572d7ffe1a6c3a8826e90c918a21..0e88c99e5280cd13c95a439183a0488373fdae09 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -108,7 +108,7 @@ switch ($mode) {
        `birth_day`,
        `birth_month`,
        `birth_year`,
-       `gender`,
+       `sex`,
        `max_mails`,
        `receive_mails`,
        `last_update`
@@ -131,7 +131,7 @@ LIMIT 1',
        `birth_day`,
        `birth_month`,
        `birth_year`,
-       `gender`,
+       `sex`,
        `max_mails`,
        `receive_mails`,
        `last_update`
@@ -274,7 +274,7 @@ LIMIT 1',
                                        sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `gender`='%s',
+       `sex`='%s',
        `surname`='%s',
        `family`='%s',
        `street_nr`='%s',
@@ -293,7 +293,7 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       postRequestElement('gender'),
+                                                       postRequestElement('sex'),
                                                        postRequestElement('surname'),
                                                        postRequestElement('family'),
                                                        postRequestElement('street_nr'),
@@ -312,7 +312,7 @@ LIMIT 1",
                                        sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `gender`='%s',
+       `sex`='%s',
        `surname`='%s',
        `family`='%s',
        `street_nr`='%s',
@@ -331,7 +331,7 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       postRequestElement('gender'),
+                                                       postRequestElement('sex'),
                                                        postRequestElement('surname'),
                                                        postRequestElement('family'),
                                                        postRequestElement('street_nr'),

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index d64031746524efe986425ab802b871a1d1f8c304..a83d17fea2f43b67352023791753a98367e67313 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -94,7 +94,7 @@ switch ($mode) {
                        $valid_recipient = isValidId(postRequestElement('to_userid'));
 
                        // Re-check receivers and own personal data
-                       $result = sqlQueryEscaped("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED'" . runFilterChain('user_exclusion_sql', ' ') . " LIMIT 2",
+                       $result = sqlQueryEscaped("SELECT `userid`, `sex`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED'" . runFilterChain('user_exclusion_sql', ' ') . " LIMIT 2",
                                array(
                                        getMemberId(),
                                        bigintval(postRequestElement('to_userid'))

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index d7c7d8f8b6cf7a68d145d76cd9e9fbdeba14aa1c..f541d3b0685f6b85ec5b4172aff3b705fcdc12de 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Data for the formular
 $result = sqlQueryEscaped("SELECT
        `id`, `company`, `position`, `tax_ident`,
-       `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+       `sex`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
        `phone`, `fax`, `cell`, `email`, `url`,
        `status`, `receive_warnings`
 FROM

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 69935673a63f5c6f07a26d28b0e31f83103169f1..eb893f5a6bf092a334872f7e7ab102d16b608bfb 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -53,7 +53,7 @@ $result = sqlQueryEscaped("SELECT
        `email`,
        `surname`,
        `family`,
-       `gender`
+       `sex`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -81,7 +81,7 @@ if (sqlNumRows($result) == 1) {
                        } else {
                                // Unsecure data which we don't want here
                                $UNSAFE = array(
-                                       'company', 'position', 'tax_ident', 'gender', 'surname', 'family',
+                                       'company', 'position', 'tax_ident', 'sex', 'surname', 'family',
                                        'street_nr1', 'street_nr2', 'zip', 'city', 'country', 'phone', 'fax', 'cell',
                                        'email', 'url'
                                );

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 96799a7f2017d2f22149a11484a97a13b6275e7a..f199c7ab3956cab429b26430ca3af6de86efb6ac 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Load some data
 $result = sqlQueryEscaped('SELECT
        `id`,
-       `gender`,
+       `sex`,
        `surname`,
        `family`,
        (`points_amount` - `points_used`) AS `points`

diff --git a/inc/template-functions.php b/inc/template-functions.php
index c0bb014ea8a899830a971896a772c90c6a3695c4..3f9be64120d0f51792cb888ea666c47d55be6261 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -2034,24 +2034,24 @@ function returnErrorMessage ($message) {
        return loadTemplate('admin_settings_unsaved', TRUE, $message);
 }
 
-// Generates a selection box for (maybe) given gender
-function generateGenderSelectionBox ($selectedGender = '', $fieldName = 'gender') {
+// Generates a selection box for (maybe) given sex
+function generateSexSelectionBox ($selectedSex = '', $fieldName = 'sex') {
        // Start the HTML code
        $out  = '<select name="' . $fieldName . '" size="1" class="form_select">';
 
        // Add options
        $out .= generateOptions(
                '/ARRAY/',
-               array(
+               [
                        'M',
                        'F',
                        'C'
-               ), array(
-                       '{--GENDER_M--}',
-                       '{--GENDER_F--}',
-                       '{--GENDER_C--}'
-               ),
-               $selectedGender
+               ], [
+                       '{--SEX_M--}',
+                       '{--SEX_F--}',
+                       '{--SEX_C--}'
+               ],
+               $selectedSex
        );
 
        // Finish HTML code

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 952c0cfb6606542747f968e4167394e8812ea5b0..6d97702165da47239f9cb8e5ec4e834bb7223bd0 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.php.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>phpreports</name>
+            <name>mailer</name>
         </data>
         <libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/>
     </configuration>

diff --git a/templates/de/emails/admin/admin_add_user_subids.tpl b/templates/de/emails/admin/admin_add_user_subids.tpl
index 6110817a010dfc7b70f2e5f8c2a114d06595b1fa..5cafd663af89a058fe6b22f79e7384cd0b7f5b43 100644 (file)
--- a/templates/de/emails/admin/admin_add_user_subids.tpl
+++ b/templates/de/emails/admin/admin_add_user_subids.tpl
@@ -8,7 +8,7 @@ Sub-Id Kennung: $content[id]
 ------------------------------------------
 Sub-Id: $content[subid]
 ------------------------------------------
-Anrede: {%user,gender,translateGender=$content[userid]%}
+Anrede: {%user,sex,translateSex=$content[userid]%}
 Vorname: {%user,surname=$content[userid]%}
 Nachname: {%user,family=$content[userid]%}
 Email-Adresse: {%user,email=$content[userid]%}

diff --git a/templates/de/emails/admin/admin_beg_ref_referral.tpl b/templates/de/emails/admin/admin_beg_ref_referral.tpl
index 3485b87a0e6f82433793394e4bde64f138b0dd0f..0ea6837b806be8d95917274e227580fcd74b813c 100644 (file)
--- a/templates/de/emails/admin/admin_beg_ref_referral.tpl
+++ b/templates/de/emails/admin/admin_beg_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ein Mitglied soeben beim Betteln {%pipe,translateComma=$content[points]%} {?POINTS?} per anteiliger Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/admin/admin_beg_referral.tpl b/templates/de/emails/admin/admin_beg_referral.tpl
index 8eb8e6d014fd8f3acb8dd817243fd34d0f60646a..43d181e3b046e1f0d8bca6034494db88a4ab9984 100644 (file)
--- a/templates/de/emails/admin/admin_beg_referral.tpl
+++ b/templates/de/emails/admin/admin_beg_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ein Mitglied soeben beim Betteln {%pipe,translateComma=$content[points]%} {?POINTS?} per Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/admin/admin_coupon_cashed.tpl b/templates/de/emails/admin/admin_coupon_cashed.tpl
index 994feacb6fdd0883df1a2544febfdc6b50838b6d..67edc2f53dc0a6ad2a8a317d22c7f76a6a405de5 100644 (file)
--- a/templates/de/emails/admin/admin_coupon_cashed.tpl
+++ b/templates/de/emails/admin/admin_coupon_cashed.tpl
@@ -19,7 +19,7 @@ Daten des Mitgliedes:
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_earning_added.tpl b/templates/de/emails/admin/admin_earning_added.tpl
index 2df5192aa508d125dbe8b98960e78da4e05ee7b7..c8053f0a457a252474a2fc69905ac0de8baa326b 100644 (file)
--- a/templates/de/emails/admin/admin_earning_added.tpl
+++ b/templates/de/emails/admin/admin_earning_added.tpl
@@ -5,7 +5,7 @@ ein Mitglied soeben einen Zusatzverdienst eingestellt. Hier sind alle relevanten
 ------------------------------
 Mitglied-Id: $userid
 ------------------------------
-Vor- und Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor- und Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Eintragsnummer: $content[insert_id]
 ------------------------------

diff --git a/templates/de/emails/admin/admin_earning_updated.tpl b/templates/de/emails/admin/admin_earning_updated.tpl
index 23f618474189ed2a8ac288b53bdfe47bf9bd221a..f052bc333ac60024a5f6c85d9f38a32b425ecdba 100644 (file)
--- a/templates/de/emails/admin/admin_earning_updated.tpl
+++ b/templates/de/emails/admin/admin_earning_updated.tpl
@@ -5,7 +5,7 @@ soeben hat ein Mitglied seinen Zusatzverdienst aktualisiert. Hier sind alle rele
 ------------------------------
 Mitglied-Id: $userid
 ------------------------------
-Vor- und Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor- und Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anzahl pro Tag: $content[daily_amount]
 ------------------------------

diff --git a/templates/de/emails/admin/admin_holiday_deactivated.tpl b/templates/de/emails/admin/admin_holiday_deactivated.tpl
index d4d18d36470399073200370a76af6c1120fbbd54..4028eea508004299784261fd79c2e32e2b267b1b 100644 (file)
--- a/templates/de/emails/admin/admin_holiday_deactivated.tpl
+++ b/templates/de/emails/admin/admin_holiday_deactivated.tpl
@@ -7,7 +7,7 @@ Die Mitglied-Id ist: $userid
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_holiday_request.tpl b/templates/de/emails/admin/admin_holiday_request.tpl
index 40c85442b06808c57161f95db81f83dde552ce24..4e658788803b45e3493d905dc47fd19283d7fa39 100644 (file)
--- a/templates/de/emails/admin/admin_holiday_request.tpl
+++ b/templates/de/emails/admin/admin_holiday_request.tpl
@@ -7,7 +7,7 @@ Die Mitglied-Id ist: $userid
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_mydata_notify.tpl b/templates/de/emails/admin/admin_mydata_notify.tpl
index 0b48f3976523f3cd8cb107641a0500d118d1c4a6..68e388e5852a395717b6cafe1f7914431b6925dc 100644 (file)
--- a/templates/de/emails/admin/admin_mydata_notify.tpl
+++ b/templates/de/emails/admin/admin_mydata_notify.tpl
@@ -5,7 +5,7 @@ Hallo Administrator,
 ------------------------------------------
 {--MEMBER_USERID--}: $userid
 ------------------------------------------
-{--GENDER--}: {%user,gender,translateGender=$userid%}
+{--SEX--}: {%user,sex,translateSex=$userid%}
 {--SURNAME--}: {%user,surname=$userid%}
 {--FAMILY--}: {%user,family=$userid%}
 {--STREET_NR--}: {%user,street_nr=$userid%}

diff --git a/templates/de/emails/admin/admin_newsletter_reset.tpl b/templates/de/emails/admin/admin_newsletter_reset.tpl
index 81d8ac808290561dea176c5902f682e3877a5cda..f60d39420d6003fb3e0d9e8a64cdad7e69ab244e 100644 (file)
--- a/templates/de/emails/admin/admin_newsletter_reset.tpl
+++ b/templates/de/emails/admin/admin_newsletter_reset.tpl
@@ -7,7 +7,7 @@ Die Mitglied-Id ist: $userid
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_order_normal.tpl b/templates/de/emails/admin/admin_order_normal.tpl
index 52433de67bef11b1b0ac8495a45e0b2e5d14358d..4b4f5953366138870ea77ef4f9a3f6b99205d454 100644 (file)
--- a/templates/de/emails/admin/admin_order_normal.tpl
+++ b/templates/de/emails/admin/admin_order_normal.tpl
@@ -6,7 +6,7 @@ Seine Buchung befindet sich nun im Sende-Pool und wird automatisch in {?max_send
 
 Hier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung:
 ------------------------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/admin/admin_payout_request.tpl b/templates/de/emails/admin/admin_payout_request.tpl
index 82a2ebe395a21fc9a7b2b9dcd353bc2a2ec9348e..9544e09073cafabd24bb9ca386efe1933cc8a79d 100644 (file)
--- a/templates/de/emails/admin/admin_payout_request.tpl
+++ b/templates/de/emails/admin/admin_payout_request.tpl
@@ -14,7 +14,7 @@ IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------
 Browser: {%server,user_agent%}
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/admin/admin_payout_request_banner.tpl b/templates/de/emails/admin/admin_payout_request_banner.tpl
index dfd8745d627007d41f43e851508a04beb2bc2c18..b5f0ea2f836ccabfe0cd11c302ff78abe08221e7 100644 (file)
--- a/templates/de/emails/admin/admin_payout_request_banner.tpl
+++ b/templates/de/emails/admin/admin_payout_request_banner.tpl
@@ -14,7 +14,7 @@ IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------
 Browser: {%server,user_agent%}
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/admin/admin_refback_ref_referral.tpl b/templates/de/emails/admin/admin_refback_ref_referral.tpl
index b548ff3567e6faeaa4b0c37f7f1f5042cdb03eca..e4cd4fd1e23e9a3a4a1d7b42b8d32d73c0e64d8e 100644 (file)
--- a/templates/de/emails/admin/admin_refback_ref_referral.tpl
+++ b/templates/de/emails/admin/admin_refback_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 soeben hat ein Mitglied anteilig Refback-{?POINTS?} von einer Referralgutschrift erhalten.
 

diff --git a/templates/de/emails/admin/admin_refback_referral.tpl b/templates/de/emails/admin/admin_refback_referral.tpl
index 0a28297947dbb2ac9050269f4dbddd913d7d9273..f3eca52a15f446892581512e4d7e0b7c0f66d567 100644 (file)
--- a/templates/de/emails/admin/admin_refback_referral.tpl
+++ b/templates/de/emails/admin/admin_refback_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 soeben hat ein Mitglied Refback-{?POINTS?} von einer Referralgutschrift erhalten.
 

diff --git a/templates/de/emails/admin/admin_register_done.tpl b/templates/de/emails/admin/admin_register_done.tpl
index 56589329911c0ae6ac9fb175173a919ede329165..721251fe9f63cf0c9194d02a6740213ce2d985bf 100644 (file)
--- a/templates/de/emails/admin/admin_register_done.tpl
+++ b/templates/de/emails/admin/admin_register_done.tpl
@@ -4,7 +4,7 @@ Ein Gast hat sich soeben bei uns angemeldet.
 
 Hier sind zur Überprüfung nochmals seine persönlichen Daten:
 -------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Straße und Hausnummer: $content[street]

diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl
index 204177c1ed950cff8424dfc6231e2cd1cbdfa15a..37a324c3a4351b5c3cae093a836774301331ea1c 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_data.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
-{--GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
+{--SEX--}: {%pipe,translateSex=$content[new_data][sex]%} ({%pipe,translateSex=$content[sex]%})
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])

diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl
index 5bf94dd255d1770385b8239806e46de3eebd6515..cc6839ea0b239f5e216af014db7bc8ef02ba33ca 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_email.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
-{--GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
+{--SEX--}: {%pipe,translateSex=$content[new_data][sex]%} ({%pipe,translateSex=$content[sex]%})
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])

diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl
index 8f66a22789da709196c777d0a4c300fe32d85238..49c01e8bd56bfebb1da823a900c13b5bffef94d1 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_edit.tpl
+++ b/templates/de/emails/admin/admin_sponsor_edit.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]
@@ -12,7 +12,7 @@ Es sind folgende Daten gespeichert:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position]
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident]
 ------------------------------
-{--GENDER--}: {%sponsor,gender,translateGender=$content[id]%}
+{--SEX--}: {%sponsor,sex,translateSex=$content[id]%}
 {--SURNAME_FAMILY--}: {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1]
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2]

diff --git a/templates/de/emails/admin/admin_sponsor_pending.tpl b/templates/de/emails/admin/admin_sponsor_pending.tpl
index 3b5c7bd1192d2fb83783b8470f6b9b45a57efc32..ae8765fbb4d86d417915ce09090e68292a27abee 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_pending.tpl
+++ b/templates/de/emails/admin/admin_sponsor_pending.tpl
@@ -16,7 +16,7 @@ Ihre Sponsor-Id lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: {%pipe,translateGender=$content[gender]%}
+Anrede: {%pipe,translateSex=$content[sex]%}
 ------------------------------
 Vorname: {%sponsor,surname=$content[id]%}
 ------------------------------

diff --git a/templates/de/emails/admin/admin_sponsor_reg.tpl b/templates/de/emails/admin/admin_sponsor_reg.tpl
index b3b7cef7685b72cca235a4b4750a5b05038c52e1..24dac7219855b53b6b598cfd5d2720d4f82ecbce 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_reg.tpl
+++ b/templates/de/emails/admin/admin_sponsor_reg.tpl
@@ -10,7 +10,7 @@ Hash-Wert: $content[hash]
 ------------------------------
 Angemeldet am: $content[timestamp]
 ------------------------------
-Anrede: {%sponsor,gender,translateGender=$content[id]%}
+Anrede: {%sponsor,sex,translateSex=$content[id]%}
 ------------------------------
 Vorname: {%sponsor,surname=$content[id]%}
 ------------------------------

diff --git a/templates/de/emails/admin/admin_support_ordr.tpl b/templates/de/emails/admin/admin_support_ordr.tpl
index 415ef03a29d49f52509530d208eca718f296839a..176c82d49caa84c68de25893805adc70ceb7acc2 100644 (file)
--- a/templates/de/emails/admin/admin_support_ordr.tpl
+++ b/templates/de/emails/admin/admin_support_ordr.tpl
@@ -7,7 +7,7 @@ Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgefül
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_support_reflink.tpl b/templates/de/emails/admin/admin_support_reflink.tpl
index 1ba684a75ec46da03cb41955c4689fa07070fae3..20b09f76e3fdfc5e7688fd7a2dde48d1149742ae 100644 (file)
--- a/templates/de/emails/admin/admin_support_reflink.tpl
+++ b/templates/de/emails/admin/admin_support_reflink.tpl
@@ -7,7 +7,7 @@ Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgefül
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_support_unconfirmed.tpl b/templates/de/emails/admin/admin_support_unconfirmed.tpl
index 15e4bf1903b910e1ea95258a137ebdde86224b3d..ddab6773b5b1772117ec0d8b0b7b3dd6d14c1ccb 100644 (file)
--- a/templates/de/emails/admin/admin_support_unconfirmed.tpl
+++ b/templates/de/emails/admin/admin_support_unconfirmed.tpl
@@ -7,7 +7,7 @@ Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgefül
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------

diff --git a/templates/de/emails/admin/admin_transfer_points.tpl b/templates/de/emails/admin/admin_transfer_points.tpl
index 14d5775bd840ac73233fb3bb046bbf0b313c7c60..86aa56065f26aebd4c5d69e7cac68f7c5dbc5de0 100644 (file)
--- a/templates/de/emails/admin/admin_transfer_points.tpl
+++ b/templates/de/emails/admin/admin_transfer_points.tpl
@@ -7,13 +7,13 @@ Hier alle Infos zum Transfer:
 --  Daten des Empfängers:  --
 ------------------------------
 Mitglied-Id: $content[recipient][userid]
-Vollst. Name: {%pipe,translateGender=$content[recipient][gender]%} $content[recipient][surname] $content[recipient][family]
+Vollst. Name: {%pipe,translateSex=$content[recipient][sex]%} $content[recipient][surname] $content[recipient][family]
 Email-Adresse: $content[recipient][email]
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------
 Mitglied-Id: $content[sender][userid]
-Vollst. Name: {%pipe,translateGender=$content[sender][gender]%} $content[sender][surname] $content[sender][family]
+Vollst. Name: {%pipe,translateSex=$content[sender][sex]%} $content[sender][surname] $content[sender][family]
 Email-Adresse: $content[sender][email]
 ------------------------------
 IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})

diff --git a/templates/de/emails/admin/admin_wernis_request.tpl b/templates/de/emails/admin/admin_wernis_request.tpl
index a5de2b01008e7a6051617890201343346cda927f..a0b5f7bba974e2df6826ca88f9517da755e267e4 100644 (file)
--- a/templates/de/emails/admin/admin_wernis_request.tpl
+++ b/templates/de/emails/admin/admin_wernis_request.tpl
@@ -14,7 +14,7 @@ IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
 ------------------------------
 Browser: {%server,user_agent%}
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/beg/beg_di_notify.tpl b/templates/de/emails/beg/beg_di_notify.tpl
index 60cab9817f919c9bf61c9fc1616504cc333eaec3..d6de48895490f6805ea39251821436bdab35aa7e 100644 (file)
--- a/templates/de/emails/beg/beg_di_notify.tpl
+++ b/templates/de/emails/beg/beg_di_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/beg/beg_en_notify.tpl b/templates/de/emails/beg/beg_en_notify.tpl
index 2563dccb74884e0a8bb804e1c3ddaa74ec3d41c5..e7fb1ff561f118eb51a3bc006e4e909019ddeb8e 100644 (file)
--- a/templates/de/emails/beg/beg_en_notify.tpl
+++ b/templates/de/emails/beg/beg_en_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/bonus/bonus_di_notify.tpl b/templates/de/emails/bonus/bonus_di_notify.tpl
index a8d6d726d02434d08e0da8eccf16f450eb63cb3a..796509b2241fcd8addfbf20df788ad29380d119c 100644 (file)
--- a/templates/de/emails/bonus/bonus_di_notify.tpl
+++ b/templates/de/emails/bonus/bonus_di_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/bonus/bonus_en_notify.tpl b/templates/de/emails/bonus/bonus_en_notify.tpl
index de39ab3c7cafae29378a29a8f8c5423a3fa32d72..2b2eed38ad0b3172921a439fdc8be2350d6966e0 100644 (file)
--- a/templates/de/emails/bonus/bonus_en_notify.tpl
+++ b/templates/de/emails/bonus/bonus_en_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/guest/guest_new_password.tpl b/templates/de/emails/guest/guest_new_password.tpl
index e5d5ccce21ed51635175fabab465290f50455a1c..29390b512d4535c9afaa781b7e539f2894f5a43c 100644 (file)
--- a/templates/de/emails/guest/guest_new_password.tpl
+++ b/templates/de/emails/guest/guest_new_password.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie oder ein anderes Mitglied haben soben ein neues Passwort angefordert. Hier ist Ihr neues Passwort:
 

diff --git a/templates/de/emails/guest/guest_register_done.tpl b/templates/de/emails/guest/guest_register_done.tpl
index 7a305e5483000099e9ed226e0dafb1fd17fde248..c54e765dfdf0280124f5f56f26a9fe4694a955be 100644 (file)
--- a/templates/de/emails/guest/guest_register_done.tpl
+++ b/templates/de/emails/guest/guest_register_done.tpl
@@ -1,10 +1,10 @@
-Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
+Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
 
 vielen Dank, dass Sie sich für {?MAIN_TITLE?} entschieden haben. Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns.
 
 Hier sind nochmals zur Überprüfung Ihre persönlichen Daten:
 -----------------------------------------------
-Anrede: {%user,gender,translateGender=$content[userid]%}
+Anrede: {%user,sex,translateSex=$content[userid]%}
 Vorname: {%user,surname=$content[userid]%}
 Nachname: {%user,family=$content[userid]%}
 Straße und Hausnummer: $content[street]

diff --git a/templates/de/emails/guest/guest_request_confirm.tpl b/templates/de/emails/guest/guest_request_confirm.tpl
index 465c8be16c8e09037d0786679c628af78b764ecd..ae3354f9e420c810b44c15bab9db6ed2ba17b3dc 100644 (file)
--- a/templates/de/emails/guest/guest_request_confirm.tpl
+++ b/templates/de/emails/guest/guest_request_confirm.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten sich zu unserem {?mt_word?} {?MAIN_TITLE?} angemeldet und heute Ihren Bestätigungslink erneut angefordert, jedoch bis jetzt noch nicht Ihre eMail-Adresse bestätigt. Diesen Schritt können Sie jetzt nachholen. Danach können Sie sich im Mitgliedsbereich einloggen.
 

diff --git a/templates/de/emails/guest/guest_user_confirmed.tpl b/templates/de/emails/guest/guest_user_confirmed.tpl
index 84d756a2be5abddfc2ee37173e133c940be822c6..165463f9609dd1dc5cef5cc539e44da435064e10 100644 (file)
--- a/templates/de/emails/guest/guest_user_confirmed.tpl
+++ b/templates/de/emails/guest/guest_user_confirmed.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre Email-Adresse bestätigt und sind somit für den {?mt_word?} {?MAIN_TITLE?} freigeschaltet!
 

diff --git a/templates/de/emails/guest/guest_user_confirmed_referral.tpl b/templates/de/emails/guest/guest_user_confirmed_referral.tpl
index 07f7c770439d5da0fcd46aa9ab7d0ffd7cf3392e..e26ade51cfb4de36ca59a39f7f6d7639a31b657a 100644 (file)
--- a/templates/de/emails/guest/guest_user_confirmed_referral.tpl
+++ b/templates/de/emails/guest/guest_user_confirmed_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben heute ein neues Mitglied für {?MAIN_TITLE?} geworben!
 

diff --git a/templates/de/emails/member/member_add_points.tpl b/templates/de/emails/member/member_add_points.tpl
index e7257d2e62e50719d68f64b364d1c734da5113f4..d098bc410307060adbdc41672dc78407cfd1c12e 100644 (file)
--- a/templates/de/emails/member/member_add_points.tpl
+++ b/templates/de/emails/member/member_add_points.tpl
@@ -1,8 +1,8 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} gutgeschrieben!
 
-Grund dazu war folgender:
+Grund dazu war folsex:
 ------------------------------
 $content[reason]
 ------------------------------

diff --git a/templates/de/emails/member/member_add_user_subids.tpl b/templates/de/emails/member/member_add_user_subids.tpl
index 9ed385c51e7a2c33c2fc142103dfe9e930bae01f..e8b3171927662269d36676fc93113163ab555f53 100644 (file)
--- a/templates/de/emails/member/member_add_user_subids.tpl
+++ b/templates/de/emails/member/member_add_user_subids.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
+Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
 
 Sie haben soeben eine Sub-Id angelegt.
 

diff --git a/templates/de/emails/member/member_admin_add_all_direct.tpl b/templates/de/emails/member/member_admin_add_all_direct.tpl
index d155f076c68a414cb02441aaee6e56a9d1a74278..6695155285a2b06acf6a954fe9b7354aa838819a 100644 (file)
--- a/templates/de/emails/member/member_admin_add_all_direct.tpl
+++ b/templates/de/emails/member/member_admin_add_all_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} per Sammel-Direktgutschrift aufgebucht!
 

diff --git a/templates/de/emails/member/member_admin_add_all_ref_referral.tpl b/templates/de/emails/member/member_admin_add_all_ref_referral.tpl
index 55715458431de8e50d95148420a25c4bbb8e1de1..8ee4326760287bd660bf773c01c90885322ca523 100644 (file)
--- a/templates/de/emails/member/member_admin_add_all_ref_referral.tpl
+++ b/templates/de/emails/member/member_admin_add_all_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine anteilige Sammel-Referralgutschrift erhalten.
 

diff --git a/templates/de/emails/member/member_admin_add_all_referral.tpl b/templates/de/emails/member/member_admin_add_all_referral.tpl
index ae19871c8752662982c601f9ecdfa022f22bb237..f95a50252f7f141c82e9a4ab932e0d43473da661 100644 (file)
--- a/templates/de/emails/member/member_admin_add_all_referral.tpl
+++ b/templates/de/emails/member/member_admin_add_all_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} per Referral-System aufgebucht! Ihren Referrals werden prozentuale Gutschrift aufgebucht.
 

diff --git a/templates/de/emails/member/member_admin_add_single_direct.tpl b/templates/de/emails/member/member_admin_add_single_direct.tpl
index 6fc0fc58bd72622e56883e79dff888a9439d1368..559f364ce7897b63244a483402eb8658f9a53e03 100644 (file)
--- a/templates/de/emails/member/member_admin_add_single_direct.tpl
+++ b/templates/de/emails/member/member_admin_add_single_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} per Direktgutschrift aufgebucht!
 

diff --git a/templates/de/emails/member/member_admin_add_single_referral.tpl b/templates/de/emails/member/member_admin_add_single_referral.tpl
index ae19871c8752662982c601f9ecdfa022f22bb237..f95a50252f7f141c82e9a4ab932e0d43473da661 100644 (file)
--- a/templates/de/emails/member/member_admin_add_single_referral.tpl
+++ b/templates/de/emails/member/member_admin_add_single_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} per Referral-System aufgebucht! Ihren Referrals werden prozentuale Gutschrift aufgebucht.
 

diff --git a/templates/de/emails/member/member_autopurge_inactive.tpl b/templates/de/emails/member/member_autopurge_inactive.tpl
index 5774358275483f941d8c19d31e3b8e56c512b5ee..1bf6e79800aca72bdb7ee973f0de41709352e5f2 100644 (file)
--- a/templates/de/emails/member/member_autopurge_inactive.tpl
+++ b/templates/de/emails/member/member_autopurge_inactive.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_autopurge_points.tpl b/templates/de/emails/member/member_autopurge_points.tpl
index 16bb0f5522ec3f5fab311d7688a8276184db06ed..e3e254a298c17bed8c0a43b4035646578078ef89 100644 (file)
--- a/templates/de/emails/member/member_autopurge_points.tpl
+++ b/templates/de/emails/member/member_autopurge_points.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Bei der automatischen Loeschung von Bestätigungslinks wurden Ihnen {%pipe:translateComma=$content[points]%} {?POINTS?} wieder gutgeschrieben!
 

diff --git a/templates/de/emails/member/member_beg.tpl b/templates/de/emails/member/member_beg.tpl
index 1640ee51cb3982abb9e7974950cfa154938baccb..51dac2e3c81c22f26f1ef440d622fd6e7083a884 100644 (file)
--- a/templates/de/emails/member/member_beg.tpl
+++ b/templates/de/emails/member/member_beg.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre {%pipe,translateComma=$content[beg_points]%} {?POINTS?} gewonnen!
 

diff --git a/templates/de/emails/member/member_beg_direct.tpl b/templates/de/emails/member/member_beg_direct.tpl
index 769e641936ca3e8c1497f0b7dcd34536215da8fe..d5ead87b98e90cdcd891377aacf8f02f7dad36ad 100644 (file)
--- a/templates/de/emails/member/member_beg_direct.tpl
+++ b/templates/de/emails/member/member_beg_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben beim Betteln {%pipe,translateComma=$content[points]%} {?POINTS?} per Direktgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_beg_ref_referral.tpl b/templates/de/emails/member/member_beg_ref_referral.tpl
index 65c74bbe0a4b6bc82a1de2507a0ae196978f9451..0660b1352a5c89281a7a01e1ce49e813b402ab73 100644 (file)
--- a/templates/de/emails/member/member_beg_ref_referral.tpl
+++ b/templates/de/emails/member/member_beg_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben beim Betteln {%pipe,translateComma=$content[points]%} {?POINTS?} per anteiliger Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_beg_referral.tpl b/templates/de/emails/member/member_beg_referral.tpl
index dae0bc5e966b91cbe4623a8fed1da2b84616cdc8..823f8f06ad82c20fec29a7a796bd0a0076d001c5 100644 (file)
--- a/templates/de/emails/member/member_beg_referral.tpl
+++ b/templates/de/emails/member/member_beg_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben beim Betteln {%pipe,translateComma=$content[points]%} {?POINTS?} per Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_birthday.tpl b/templates/de/emails/member/member_birthday.tpl
index 5138ffe18b9595e674936c880a4189d56867cef2..516e013fb2c903b6b68453a2f7a67ce66d05d6a2 100644 (file)
--- a/templates/de/emails/member/member_birthday.tpl
+++ b/templates/de/emails/member/member_birthday.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir das Team von {?MAIN_TITLE?} wünschen Ihnen alles Gute und Gesundheit zu Ihrem $content. Geburtstag!
 

diff --git a/templates/de/emails/member/member_birthday_confirm.tpl b/templates/de/emails/member/member_birthday_confirm.tpl
index 141914660f192b534583e42047b1524770f43db7..c6b36ea88a7cc60d7b722f2c7536b995f5abeb58 100644 (file)
--- a/templates/de/emails/member/member_birthday_confirm.tpl
+++ b/templates/de/emails/member/member_birthday_confirm.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir das Team von {?MAIN_TITLE?} wünschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 

diff --git a/templates/de/emails/member/member_bonus.tpl b/templates/de/emails/member/member_bonus.tpl
index 8bcfddc527d43d270912a3d745a3d1810c7eb3cd..67c4fb895bdd7d82a48a990a5d46332d75671cfc 100644 (file)
--- a/templates/de/emails/member/member_bonus.tpl
+++ b/templates/de/emails/member/member_bonus.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre {%pipe,translateComma=$content[points]%} {?POINTS?} gewonnen!
 

diff --git a/templates/de/emails/member/member_bonus_pool_normal.tpl b/templates/de/emails/member/member_bonus_pool_normal.tpl
index a46bda49379ba8fac8ce48e4b437c5fffef29d06..68a09c07dd96f2bcc656580a9d5b82dc1a0021bb 100644 (file)
--- a/templates/de/emails/member/member_bonus_pool_normal.tpl
+++ b/templates/de/emails/member/member_bonus_pool_normal.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Hier kommt eine Bonus-Mail von uns zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 

diff --git a/templates/de/emails/member/member_contct.tpl b/templates/de/emails/member/member_contct.tpl
index 81ef480a551d79ccfd47df8c9f3dea32042fff54..59f2591c05f42245c3f3934cb5ab4302d95c01d1 100644 (file)
--- a/templates/de/emails/member/member_contct.tpl
+++ b/templates/de/emails/member/member_contct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $content[userid]

diff --git a/templates/de/emails/member/member_coupon_code.tpl b/templates/de/emails/member/member_coupon_code.tpl
index f62d586bcc292f1a43027a07bc1de59d8dc4d05d..982f25a58b929835f74ca8412433efe60ed1aa64 100644 (file)
--- a/templates/de/emails/member/member_coupon_code.tpl
+++ b/templates/de/emails/member/member_coupon_code.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_delete_links.tpl b/templates/de/emails/member/member_delete_links.tpl
index 424ad09198b28f51063ce33b45939431a946374f..03dca2fd5ac43f660d1217cfab98ba625f90b484 100644 (file)
--- a/templates/de/emails/member/member_delete_links.tpl
+++ b/templates/de/emails/member/member_delete_links.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre unbestätigten Mails gelöscht!
 

diff --git a/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl b/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl
index 9ce7ab432c51a6a52c328aca2ab2a9288e939890..74d9904ba2206838c08adde9210a3ea85fed07a0 100644 (file)
--- a/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl
+++ b/templates/de/emails/member/member_delete_mem_delete_user_subids.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
+Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
 
 Sie haben soeben eine Ihrer Sub-Id gelöscht.
 

diff --git a/templates/de/emails/member/member_delete_surfbar_urls.tpl b/templates/de/emails/member/member_delete_surfbar_urls.tpl
index 42db2ac8360a1a8c17720f5aac4fdd119c71ed8d..e8fc3585c8c4b3cc4c0864fa20e7b4c2baf5b789 100644 (file)
--- a/templates/de/emails/member/member_delete_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_delete_surfbar_urls.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
+Hallo {%user,sex,translateSex=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
 
 wir haben soeben Ihre in unserer Surfbar gebuchte URL entfernt.
 

diff --git a/templates/de/emails/member/member_delete_user_subids.tpl b/templates/de/emails/member/member_delete_user_subids.tpl
index 1d48a1443b29d36300ab16712979a14208c9ed62..2c9e07e2554104661b46bcd6e538ef18bc6c0c4d 100644 (file)
--- a/templates/de/emails/member/member_delete_user_subids.tpl
+++ b/templates/de/emails/member/member_delete_user_subids.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
+Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
 
 eine Ihrer Sub-Ids wurde soeben durch einen Administrator gelöscht.
 

diff --git a/templates/de/emails/member/member_doubler.tpl b/templates/de/emails/member/member_doubler.tpl
index ccbf057f3bf115f148fdd0a786a779cc8ea51331..4726de5b2b45c2e1c03d9b204beae8ec30627bb8 100644 (file)
--- a/templates/de/emails/member/member_doubler.tpl
+++ b/templates/de/emails/member/member_doubler.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir haben Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} durch eine Verdoppelung vom $content[timemark] Ihrem Account gutgeschrieben!
 

diff --git a/templates/de/emails/member/member_earning_added.tpl b/templates/de/emails/member/member_earning_added.tpl
index 1a38d5759125a75f209fb2908592f110b0c2af6f..7020fd200d991602b76b22ac27115e9e166edc1b 100644 (file)
--- a/templates/de/emails/member/member_earning_added.tpl
+++ b/templates/de/emails/member/member_earning_added.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben einen Zusatzverdienst eingestellt.
 

diff --git a/templates/de/emails/member/member_earning_updated.tpl b/templates/de/emails/member/member_earning_updated.tpl
index 92c82d3bb7a8d0ad4737035a758b5764d6e25016..268a1491e681ba75c6740610215ddc2faa167fc6 100644 (file)
--- a/templates/de/emails/member/member_earning_updated.tpl
+++ b/templates/de/emails/member/member_earning_updated.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben einen Zusatzverdienst aktualisiert.
 

diff --git a/templates/de/emails/member/member_edit_forced_ads.tpl b/templates/de/emails/member/member_edit_forced_ads.tpl
index d28dfaaf9e255b11c1d6e23a778b76b7f137d160..e3707638724fc17ee7dbc732e1bd74fc3e3c0e5c 100644 (file)
--- a/templates/de/emails/member/member_edit_forced_ads.tpl
+++ b/templates/de/emails/member/member_edit_forced_ads.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[forced_ads_userid]%} {%user,surname=$content[forced_ads_userid]%} {%user,family=$content[forced_ads_userid]%},
+Hallo {%user,sex,translateSex=$content[forced_ads_userid]%} {%user,surname=$content[forced_ads_userid]%} {%user,family=$content[forced_ads_userid]%},
 
 es wurde soeben eines Ihrer Forced-Werbemittel geändert.
 

diff --git a/templates/de/emails/member/member_edit_forced_campaigns.tpl b/templates/de/emails/member/member_edit_forced_campaigns.tpl
index eaadce005716074f6f5905e4ad0b47c71e9308f3..666d24bed21ed49b28eda51f6e62b8d5d3bc5698 100644 (file)
--- a/templates/de/emails/member/member_edit_forced_campaigns.tpl
+++ b/templates/de/emails/member/member_edit_forced_campaigns.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[forced_campaign_userid]%} {%user,surname=$content[forced_campaign_userid]%} {%user,family=$content[forced_campaign_userid]%},
+Hallo {%user,sex,translateSex=$content[forced_campaign_userid]%} {%user,surname=$content[forced_campaign_userid]%} {%user,family=$content[forced_campaign_userid]%},
 
 es wurde soeben einer Ihrer Forced-Kampagnen geändert.
 

diff --git a/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl b/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl
index 68cd83bbf3152b3c600037c7df9f5dd27bff6ead..522cf264cfa99a91feb7c539eda1afeb0a3ee1bc 100644 (file)
--- a/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl
+++ b/templates/de/emails/member/member_edit_mem_edit_user_subids.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
+Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
 
 Sie haben soeben eine Ihrer Sub-Id geändert.
 

diff --git a/templates/de/emails/member/member_edit_surfbar_urls.tpl b/templates/de/emails/member/member_edit_surfbar_urls.tpl
index 0601e3a71f21878b8f21b56bf29208ae8a2d7307..a592854a3ac8e2f1dd803d9362e13344dcbc7b01 100644 (file)
--- a/templates/de/emails/member/member_edit_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_edit_surfbar_urls.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
+Hallo {%user,sex,translateSex=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
 
 wir haben soeben Ihre in unserer Surfbar gebuchte URL geändert.
 

diff --git a/templates/de/emails/member/member_edit_user_subids.tpl b/templates/de/emails/member/member_edit_user_subids.tpl
index 240cbb3ce41edf341279c6ce259b488e86a522a6..21697d5604f7a01b82977331e8649e4efed5f9e0 100644 (file)
--- a/templates/de/emails/member/member_edit_user_subids.tpl
+++ b/templates/de/emails/member/member_edit_user_subids.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
+Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%},
 
 einer Ihrer Sub-Ids wurde soeben durch einen Administrator geändert.
 

diff --git a/templates/de/emails/member/member_forced_campaign_pending_active.tpl b/templates/de/emails/member/member_forced_campaign_pending_active.tpl
index b76076d287210d2e11bee0acb40023a7812fa3b3..79eac2a52438f852c61d3ffd2addce3392518ced 100644 (file)
--- a/templates/de/emails/member/member_forced_campaign_pending_active.tpl
+++ b/templates/de/emails/member/member_forced_campaign_pending_active.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ein Administrator hat soeben Ihre Forced-Kampagne freigeschaltet.
 

diff --git a/templates/de/emails/member/member_holiday_activated.tpl b/templates/de/emails/member/member_holiday_activated.tpl
index d792daae1151b395377569e1e0bb082a3d364d61..f2c4b3885d72df630e380fb2dea7e8aad719e82e 100644 (file)
--- a/templates/de/emails/member/member_holiday_activated.tpl
+++ b/templates/de/emails/member/member_holiday_activated.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
@@ -7,7 +7,7 @@ Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Zeitpunkt Ihrer Beantragung: $content[activated] Uhr
 ------------------------------

diff --git a/templates/de/emails/member/member_holiday_removed.tpl b/templates/de/emails/member/member_holiday_removed.tpl
index 6cc3218936cffb96d3d2c2434a449d52e439a6fa..48482e185ad7167d2e558ad1574bcafc19c6d18c 100644 (file)
--- a/templates/de/emails/member/member_holiday_removed.tpl
+++ b/templates/de/emails/member/member_holiday_removed.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Wir haben soeben Ihren Urlaub bei uns beendet. Folgende Daten wurden uns übermittelt:
 
@@ -7,7 +7,7 @@ Wir haben soeben Ihren Urlaub bei uns beendet. Folgende Daten wurden uns üb
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anfang Ihres Urlaubes: $content[holiday_start]
 ------------------------------

diff --git a/templates/de/emails/member/member_holiday_request.tpl b/templates/de/emails/member/member_holiday_request.tpl
index 972c4b0797372f64330e84935b4df658ee5f8016..3d29619f21fad69102cc9f17711f876579234cc0 100644 (file)
--- a/templates/de/emails/member/member_holiday_request.tpl
+++ b/templates/de/emails/member/member_holiday_request.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
@@ -7,7 +7,7 @@ Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anfang Ihres Urlaubes: $content[start_day].$content[start_month].$content[start_year]
 ------------------------------

diff --git a/templates/de/emails/member/member_holiday_unlock.tpl b/templates/de/emails/member/member_holiday_unlock.tpl
index cddbf25485fe07ed3c4580aa889fe72df9ae6c0e..08a39cb0e7fd7d77fcb404ce2c1553ca85d60ad2 100644 (file)
--- a/templates/de/emails/member/member_holiday_unlock.tpl
+++ b/templates/de/emails/member/member_holiday_unlock.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihr beantragter Urlaub ist hiermit zu Ende. Folgende Daten hatten Sie uns übermittelt:
 
@@ -7,7 +7,7 @@ Ihr beantragter Urlaub ist hiermit zu Ende. Folgende Daten hatten Sie uns ü
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 Anfang Ihres Urlaubes: $content[holiday_start]
 ------------------------------

diff --git a/templates/de/emails/member/member_lock_active_surfbar_urls.tpl b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl
index cc39409bd4242bf3588253be54f67d0c54729987..6dc00cffc218daf5a8c5a16eea5ede689d39ee1a 100644 (file)
--- a/templates/de/emails/member/member_lock_active_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
+Hallo {%user,sex,translateSex=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
 
 wir haben soeben Ihre URL im Besuchertausch wieder freigegeben.
 

diff --git a/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl b/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
index 1f72db5e560f463f2f7240ba2ecfded8985ab97c..0609b13739bfd83608918404c09b60669be474e2 100644 (file)
--- a/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
+Hallo {%user,sex,translateSex=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
 
 wir haben soeben Ihre URL im Besuchertausch sperren müssen. Bitte halten Sie unsere AGBs ein!
 

diff --git a/templates/de/emails/member/member_mailid_okay_ref_referral.tpl b/templates/de/emails/member/member_mailid_okay_ref_referral.tpl
index f4029bcbbfc7dc254bf429b20ca0721cabe96a3e..99a25ca79f5e71b9a35bac93c8f3064fea06cd32 100644 (file)
--- a/templates/de/emails/member/member_mailid_okay_ref_referral.tpl
+++ b/templates/de/emails/member/member_mailid_okay_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 eines Ihrer geworbenen Mitglieder hay soeben eine Mail korrekt bestätigt und dafür über das Referral-System eine Gutschrift erhalten. Sie erhalten hiermit einen Anteil davon.
 

diff --git a/templates/de/emails/member/member_mailid_okay_referral.tpl b/templates/de/emails/member/member_mailid_okay_referral.tpl
index 2f2bf11a77ffc1d90b1309d6b1d011cbde5a9f79..e98d71a7ba65db942672e9193452fa21525de0e0 100644 (file)
--- a/templates/de/emails/member/member_mailid_okay_referral.tpl
+++ b/templates/de/emails/member/member_mailid_okay_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine Mail korrekt bestätigt und dafür über das Referral-System eine Gutschrift erhalten.
 

diff --git a/templates/de/emails/member/member_monthly_beg_direct.tpl b/templates/de/emails/member/member_monthly_beg_direct.tpl
index 93f482b2d08b46a7307d6d0bf9c554e0f9b6e080..2f7c835df755ae0961923acacf7cd0ba8a649b8f 100644 (file)
--- a/templates/de/emails/member/member_monthly_beg_direct.tpl
+++ b/templates/de/emails/member/member_monthly_beg_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben bei der monatlichen Bettelrallye {%pipe,translateComma=$content[points]%} {?POINTS?} per Direktgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_monthly_beg_ref_referral.tpl b/templates/de/emails/member/member_monthly_beg_ref_referral.tpl
index 7e61113e8454b7b769a01e53c490bf6966edc616..cdbd27a66f42e0889631088550f656cb8d6c00d4 100644 (file)
--- a/templates/de/emails/member/member_monthly_beg_ref_referral.tpl
+++ b/templates/de/emails/member/member_monthly_beg_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben bei der monatlichen Bettelrallye {%pipe,translateComma=$content[points]%} {?POINTS?} per anteiliger Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_monthly_beg_referral.tpl b/templates/de/emails/member/member_monthly_beg_referral.tpl
index 2a8a7b2b3489302f8ad495a40488dc276bde2661..99235fa29b8c66ebc9fd8d3af33e3f2eb594297b 100644 (file)
--- a/templates/de/emails/member/member_monthly_beg_referral.tpl
+++ b/templates/de/emails/member/member_monthly_beg_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben bei der monatlichen Bettelrallye {%pipe,translateComma=$content[points]%} {?POINTS?} per Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_monthly_bonus_direct.tpl b/templates/de/emails/member/member_monthly_bonus_direct.tpl
index a6d09eb101e068657f83ac38065f40348f12ce95..0fafe4516dde162474391c14a78fa62afd4bb15b 100644 (file)
--- a/templates/de/emails/member/member_monthly_bonus_direct.tpl
+++ b/templates/de/emails/member/member_monthly_bonus_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben bei der monatlichen Aktiv-Rallye {%pipe,translateComma=$content[points]%} {?POINTS?} per Direktgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_monthly_bonus_ref_referral.tpl b/templates/de/emails/member/member_monthly_bonus_ref_referral.tpl
index 212886aa59b02091aeba5a494b4e4230ea86dadc..ae5dd074f5ed1198eb237a188225acc1c6a2f8ec 100644 (file)
--- a/templates/de/emails/member/member_monthly_bonus_ref_referral.tpl
+++ b/templates/de/emails/member/member_monthly_bonus_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben bei der monatlichen Aktiv-Rallye {%pipe,translateComma=$content[points]%} {?POINTS?} per anteiliger Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_monthly_bonus_referral.tpl b/templates/de/emails/member/member_monthly_bonus_referral.tpl
index a074a56275666622b338c7c6bd30905829d573a3..5679c73e30d3df8459a7aafa0e5d2f0ae3b01c4e 100644 (file)
--- a/templates/de/emails/member/member_monthly_bonus_referral.tpl
+++ b/templates/de/emails/member/member_monthly_bonus_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben bei der monatlichen Aktiv-Rallye {%pipe,translateComma=$content[points]%} {?POINTS?} per Referralgutgschrift erhalten.
 

diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl
index 8447179678156d214920f65bbea10bb652d56703..356440054def5b600f0f618313e1f42593792d50 100644 (file)
--- a/templates/de/emails/member/member_mydata_notify.tpl
+++ b/templates/de/emails/member/member_mydata_notify.tpl
@@ -1,10 +1,10 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 {--MEMBER_HAVE_CHANGED_DATA--}
 
 {--MEMBER_YOUR_NEW_DATA--}:
 ------------------------------------------
-{--GENDER--}: {%user,gender,translateGender=$userid%}
+{--SEX--}: {%user,sex,translateSex=$userid%}
 {--SURNAME--}: {%user,surname=$userid%}
 {--FAMILY--}: {%user,family=$userid%}
 {--STREET_NR--}: {%user,street_nr=$userid%}

diff --git a/templates/de/emails/member/member_order_accepted.tpl b/templates/de/emails/member/member_order_accepted.tpl
index 72f37464e735edaffb663c3e27dc99cff712f19d..3721488c04c6c20269fbb0cbff0ca40571ed07a2 100644 (file)
--- a/templates/de/emails/member/member_order_accepted.tpl
+++ b/templates/de/emails/member/member_order_accepted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird.
 

diff --git a/templates/de/emails/member/member_order_deleted.tpl b/templates/de/emails/member/member_order_deleted.tpl
index 801bf11e23be518e4bd59405fcb8533b4a08e9d7..005e73b56d8f2240927ae96ad477ee3fc92fdf38 100644 (file)
--- a/templates/de/emails/member/member_order_deleted.tpl
+++ b/templates/de/emails/member/member_order_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung gelöscht. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 

diff --git a/templates/de/emails/member/member_order_normal.tpl b/templates/de/emails/member/member_order_normal.tpl
index 52fa5bc6e0fe91af35ebc9841b60cc74216a1e6d..25b5de887da2bb96e6f2ae99a7038ad219882be0 100644 (file)
--- a/templates/de/emails/member/member_order_normal.tpl
+++ b/templates/de/emails/member/member_order_normal.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!
 

diff --git a/templates/de/emails/member/member_order_rejected.tpl b/templates/de/emails/member/member_order_rejected.tpl
index 4fdb2b01ce9ac5694b9e3273b526b62dc48419dc..a95bc55ea5cd2c532e04ef3a7f6532436af051e7 100644 (file)
--- a/templates/de/emails/member/member_order_rejected.tpl
+++ b/templates/de/emails/member/member_order_rejected.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung abgelehnt. Bite beachten Sie unsere AGBs! Bei weiteren Verstoessen gegen unsere AGBs werden wir Ihre URL und ggf. auch Ihren Account sperren. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 

diff --git a/templates/de/emails/member/member_payout_accepted.tpl b/templates/de/emails/member/member_payout_accepted.tpl
index da2f5f083ec3c070a4db30124a22cfefe6d5320f..fc19bef8cf48f8afe78a3420eacedfd44deb29f3 100644 (file)
--- a/templates/de/emails/member/member_payout_accepted.tpl
+++ b/templates/de/emails/member/member_payout_accepted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_payout_rejected.tpl b/templates/de/emails/member/member_payout_rejected.tpl
index de71903d8e2f75933cb43a2f7e378a715a4a66ed..8e09b9178de3544d0aa1bb77d89b55a5304083e5 100644 (file)
--- a/templates/de/emails/member/member_payout_rejected.tpl
+++ b/templates/de/emails/member/member_payout_rejected.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_payout_request.tpl b/templates/de/emails/member/member_payout_request.tpl
index 1399b11e7079d4b80fe45683b5a1eb5fca5f87cf..751b85aef04ccbdf6152de538edf1b7f445ba6ed 100644 (file)
--- a/templates/de/emails/member/member_payout_request.tpl
+++ b/templates/de/emails/member/member_payout_request.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_payout_request_banner.tpl b/templates/de/emails/member/member_payout_request_banner.tpl
index eda0ba05df47454b56099cd8841793d76f4254f2..5080a90e6849009541960b847df96c86c1ab013d 100644 (file)
--- a/templates/de/emails/member/member_payout_request_banner.tpl
+++ b/templates/de/emails/member/member_payout_request_banner.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_profile.tpl b/templates/de/emails/member/member_profile.tpl
index 0b72f78f3492e8f46ffad31eb03dbd47abc54649..05b83fd06bc8716992eca147d81e5db9c4deaa57 100644 (file)
--- a/templates/de/emails/member/member_profile.tpl
+++ b/templates/de/emails/member/member_profile.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Haben Sie Neuigkeiten für uns? Sie hatten sich vor längerer Zeit zu unserem {?mt_word?}-Service {?MAIN_TITLE?} angemeldet. Dabei haben Sie persönliche Daten, wie Ihre komplette Anschrift usw. angegeben. Sind Sie vielleicht mittlerweile umngezogen oder haben geheiratet und haben einen anderen Namen? Oder moechten Sie vielleicht aus der einen oder anderen Kategorie noch Mails empfangen?
 

diff --git a/templates/de/emails/member/member_rallye_expired_bronce.tpl b/templates/de/emails/member/member_rallye_expired_bronce.tpl
index c820c85c27f7f37d98d805854cbaefa7128cc863..301f8d11189c94e49b291e30dcdd7d3403aafb21 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_bronce.tpl
+++ b/templates/de/emails/member/member_rallye_expired_bronce.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_rallye_expired_gold.tpl b/templates/de/emails/member/member_rallye_expired_gold.tpl
index 3064bf82a08c99014f1460817613b26070e454a1..fe71a4466e04a332944ca5172b1c9aad2a2bab73 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_gold.tpl
+++ b/templates/de/emails/member/member_rallye_expired_gold.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_rallye_expired_other.tpl b/templates/de/emails/member/member_rallye_expired_other.tpl
index da65390a52dff0748121b6687f107fa8893f9e14..a140eaa79e7d8c829626b826450309994033b60e 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_other.tpl
+++ b/templates/de/emails/member/member_rallye_expired_other.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_rallye_expired_silver.tpl b/templates/de/emails/member/member_rallye_expired_silver.tpl
index aca5f2d9028838e7e4643e3903f32cc4b9070ee4..af94c19b7246b8634020c53de7bd760245cdfc14 100644 (file)
--- a/templates/de/emails/member/member_rallye_expired_silver.tpl
+++ b/templates/de/emails/member/member_rallye_expired_silver.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_rallye_notify.tpl b/templates/de/emails/member/member_rallye_notify.tpl
index 2399b96c49bd6bed168310ab190e22fd485e7499..2bf2349080b107ac493ddee1f46cca721c8139ff 100644 (file)
--- a/templates/de/emails/member/member_rallye_notify.tpl
+++ b/templates/de/emails/member/member_rallye_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_refback.tpl b/templates/de/emails/member/member_refback.tpl
index 874ebff1df0e2dbfac1c83187aa3a9bb1bfdc8f4..2b92f91846d4b7445a477094619b6c77de327e03 100644 (file)
--- a/templates/de/emails/member/member_refback.tpl
+++ b/templates/de/emails/member/member_refback.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 das Mitglied {%pipe,getMemberId%} hat Ihnen soeben {%pipe,translateComma=$content[refback_percents]%}% Refback eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referral-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben.
 

diff --git a/templates/de/emails/member/member_refback_direct.tpl b/templates/de/emails/member/member_refback_direct.tpl
index bc4d9dd012bfffaae513845315a041fe9c640c70..7f732401a13fcdf04e5ea650bc3013e42cbcd21c 100644 (file)
--- a/templates/de/emails/member/member_refback_direct.tpl
+++ b/templates/de/emails/member/member_refback_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben {%pipe,translateComma=$content[points]%} {?POINTS?} Refback per Direktgutschrift erhalten!
 

diff --git a/templates/de/emails/member/member_refback_ref_referral.tpl b/templates/de/emails/member/member_refback_ref_referral.tpl
index 63562561681a0f5e74732e38419a98018e08a2e0..6520e9ae755af6e5c6c928bd9fa22c386810e46d 100644 (file)
--- a/templates/de/emails/member/member_refback_ref_referral.tpl
+++ b/templates/de/emails/member/member_refback_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben anteilig {%pipe,translateComma=$content[points]%} {?POINTS?} Refback von einer Referralgutschrift erhalten!
 

diff --git a/templates/de/emails/member/member_refback_referral.tpl b/templates/de/emails/member/member_refback_referral.tpl
index 81821a462e325820925d33b7c15cc0d03bbce15e..e46d885fc3a40aef8f8e2cd1db83025ce5cd1179 100644 (file)
--- a/templates/de/emails/member/member_refback_referral.tpl
+++ b/templates/de/emails/member/member_refback_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben {%pipe,translateComma=$content[points]%} {?POINTS?} Refback von einer Referralgutschrift erhalten!
 

diff --git a/templates/de/emails/member/member_referral_bonus_direct.tpl b/templates/de/emails/member/member_referral_bonus_direct.tpl
index 2c1f10c6f5c4c1a6f21d56ac658a4799d1e2403c..3408f8f16ea6b5a132e9dd8578aa09f01a6bb3a4 100644 (file)
--- a/templates/de/emails/member/member_referral_bonus_direct.tpl
+++ b/templates/de/emails/member/member_referral_bonus_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 eines Ihrer geworbenen Mitglieder hat soeben seine Email-Adresse bestätigt. Dabei haben Sie eine einmalige Werbeprämie per Direktgutschrift erhalten.
 

diff --git a/templates/de/emails/member/member_referral_bonus_ref_referral.tpl b/templates/de/emails/member/member_referral_bonus_ref_referral.tpl
index ca801d6d5590914f96030a204b96cb1197803686..3e3ca39aa2ecd09f09c549198199570d444470ed 100644 (file)
--- a/templates/de/emails/member/member_referral_bonus_ref_referral.tpl
+++ b/templates/de/emails/member/member_referral_bonus_ref_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 eines Ihrer geworbenen Mitglieder hat soeben seine Email-Adresse bestätigt. Dabei haben Sie einen Anteiler seiner einmaligen Werbeprämie per Referralgutschrift erhalten.
 

diff --git a/templates/de/emails/member/member_referral_bonus_referral.tpl b/templates/de/emails/member/member_referral_bonus_referral.tpl
index dd804c52cb7e856d04cb0dc07c7447f24a4d46f9..c3e1f20e150cf8aeac2c8ec48f2e8b62ad571e87 100644 (file)
--- a/templates/de/emails/member/member_referral_bonus_referral.tpl
+++ b/templates/de/emails/member/member_referral_bonus_referral.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 eines Ihrer geworbenen Mitglieder hat soeben seine Email-Adresse bestätigt. Dabei haben Sie eine einmalige Werbeprämie per Referralgutschrift erhalten.
 

diff --git a/templates/de/emails/member/member_register_welcome_direct.tpl b/templates/de/emails/member/member_register_welcome_direct.tpl
index c710f70f4bc47848920d3cf7fe5fa7a4bbcd3c8b..7973c0825d66fa37b65a85c72d27812451a3487a 100644 (file)
--- a/templates/de/emails/member/member_register_welcome_direct.tpl
+++ b/templates/de/emails/member/member_register_welcome_direct.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben per Direktgutschrift Ihre Willkommensgutschrift erhalten.
 

diff --git a/templates/de/emails/member/member_stats_bonus.tpl b/templates/de/emails/member/member_stats_bonus.tpl
index 5160ac00e89ecf3e31a93545d335f3ccb6de2d1e..3d623cf02eca3b4dcf3dcf922171d513361b5f39 100644 (file)
--- a/templates/de/emails/member/member_stats_bonus.tpl
+++ b/templates/de/emails/member/member_stats_bonus.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben {%config,translateComma=bonus_stats%} {?POINTS?} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
 

diff --git a/templates/de/emails/member/member_sub_points.tpl b/templates/de/emails/member/member_sub_points.tpl
index 073d934c1113890dc7a34037a20664771a1bc8bb..78f053953cc5834eb7cab6d07b6cbe76cf0143ac 100644 (file)
--- a/templates/de/emails/member/member_sub_points.tpl
+++ b/templates/de/emails/member/member_sub_points.tpl
@@ -1,8 +1,8 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} abgezogen!
 
-Grund dazu war folgender:
+Grund dazu war folsex:
 ----------------
 $content[reason]
 ----------------

diff --git a/templates/de/emails/member/member_support_ordr.tpl b/templates/de/emails/member/member_support_ordr.tpl
index 88f485db34b3e7e15e3ee5bd9ba34e613b070e57..1c1c09fe990b372e1ca414d7a0ef92b0f5094ac8 100644 (file)
--- a/templates/de/emails/member/member_support_ordr.tpl
+++ b/templates/de/emails/member/member_support_ordr.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
@@ -7,7 +7,7 @@ Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Su
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 
 $content[text]

diff --git a/templates/de/emails/member/member_support_reflink.tpl b/templates/de/emails/member/member_support_reflink.tpl
index 937a89367968d27b39efd1641b9a12b48199fbaa..6374a4bd0410c9ac106c0069371a487ff6797d17 100644 (file)
--- a/templates/de/emails/member/member_support_reflink.tpl
+++ b/templates/de/emails/member/member_support_reflink.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten eine Frage zu Ihrem Referral-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
@@ -7,7 +7,7 @@ Sie hatten eine Frage zu Ihrem Referral-Link uns gestellt. Folgendes wurde an de
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 
 $content[text]

diff --git a/templates/de/emails/member/member_support_unconfirmed.tpl b/templates/de/emails/member/member_support_unconfirmed.tpl
index b65a9774ac935e2dc018bcadc9c6059d86763855..70a59a8610ddb3548a375c08d7db6ead8f67340d 100644 (file)
--- a/templates/de/emails/member/member_support_unconfirmed.tpl
+++ b/templates/de/emails/member/member_support_unconfirmed.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten uns wegen Ihrer unbestätigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
 
@@ -7,7 +7,7 @@ Sie hatten uns wegen Ihrer unbestätigten Mails kontaktiert. Folgendes wurde
 ------------------------------
 E-Mail Adresse: {%user,email=$userid%}
 ------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+Vor-, Nachname: {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
 ------------------------------
 
 $content[text]

diff --git a/templates/de/emails/member/member_surfbar_low_points.tpl b/templates/de/emails/member/member_surfbar_low_points.tpl
index a02750f0b70e59333a162ce03ab7575c22055bdb..5d0b6492efd0e91002922c3087bdfc6066ea327b 100644 (file)
--- a/templates/de/emails/member/member_surfbar_low_points.tpl
+++ b/templates/de/emails/member/member_surfbar_low_points.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand ist unter dem Limit von {%config,translateComma=surfbar_warn_low_points%} {?POINTS?} gefallen worüber Sie informiert werden wollten. Ihre gebuchte(n) URL(s) wird/werden bei einem Guthaben von 0 {?POINTS?} nicht mehr aufgerufen.
 

diff --git a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl
index 5e0789fb75719007af09266b9923e29509117de2..6b6157a4a249d62be947f45fb9f9e3bdeef21c20 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre freigegebene URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 

diff --git a/templates/de/emails/member/member_surfbar_url_active_pending.tpl b/templates/de/emails/member/member_surfbar_url_active_pending.tpl
index 8d61d5040fa39d8ee97acfbeb36b60acdd1df4e9..9d5875154a04cacec55333e44c42dbbfb0b9b527 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_active_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre freigegebene URL geändert. Dabei wurde sie auf "Wartend" gestellt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl
index c546479b8c2495bb14e809d6d05d6536b6fb1040..d92204711e2d75f79e0d25832ff86efd5ee35a26 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl
+++ b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gebuchte URL gestoppt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_confirmed.tpl b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
index 430854b5970369f56529187735b1ba95d1c0442f..653f8e852ddcd5baffcc02c8c8742303fe3129f9 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_confirmed.tpl
+++ b/templates/de/emails/member/member_surfbar_url_confirmed.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde soeben in unserer Surfbar freigegeben.
 

diff --git a/templates/de/emails/member/member_surfbar_url_depleted.tpl b/templates/de/emails/member/member_surfbar_url_depleted.tpl
index 06bb4ce6f4e763c40d19943c7372d64170672090..49c9f9a4712669b093c90253a834527d53b99102 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_depleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_depleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde soeben angehalten, da die maximalen Einblendungen verbraucht sind.
 

diff --git a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
index a3cd4d38d5813c46a6b0975fdf3c8be64fba348d..edb52abe5d8d8d33b5579393b60ff93f8fe8dd27 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre gesperrte URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 

diff --git a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
index 6b51bebf635340d0f5d0e6a7d15868f9382c6b18..de44ac59393a04afd71c67c23fdb5c7401a14e7b 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gesperrte URL erneut gebucht. Dabei wurde sie auf "Wartend" gestellt. Bitte beachten Sie hierbei, dass Missbrauch dieser Funktion zur Sperrung Ihres Accounts auf {?MAIN_TITLE?} führen kann.
 

diff --git a/templates/de/emails/member/member_surfbar_url_migrate.tpl b/templates/de/emails/member/member_surfbar_url_migrate.tpl
index cdc466d9655f92137dd5d4a3955ee55a8682d2b7..fd4ef6385f940cf140e3679acbd1cca0eafe91eb 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_migrate.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrate.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 durch Freischaltung einer Mailbuchung wurde Ihre gebuche URL in die Surfbar migriert.
 

diff --git a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
index cf682d36afda937b83bbcdb3c9798c4f65d4f089..851c8b72f3a1283c997226fe7d2dc84b3c233e81 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 

diff --git a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
index ed6f7066398b528839f01a6a76b12ed6bce8108a..d50e2fd8ba05d5093e6adea32fe133868adc10f7 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre aus der Mailbuchung migrierte URL geändert. Bitte buchen Sie diese, wenn Sie dies wünschen.
 

diff --git a/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
index 1df16ea5d9db50a28cddd40c0b3eb9c964af9796..c8979c7c9ec1ca994c4c0902417646388ddfc07a 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gebucht. Dabei wurde sie auf "Wartend" gestellt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_pending.tpl b/templates/de/emails/member/member_surfbar_url_pending.tpl
index f9a8c1a3ab93b596e97bf970bf2d9d8b32913661..51bb2972034b8304c155fee8fe5453776bb6de6b 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 vielen Dank für Ihre Zusatzbuchung Ihrer URL in unserer Surfbar.
 

diff --git a/templates/de/emails/member/member_surfbar_url_pending_active.tpl b/templates/de/emails/member/member_surfbar_url_pending_active.tpl
index d4302450fba6afe37a90b0a80b1b2f0cf482befa..cbb8b361a895b39215634311b402c2cc0dae1407 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_pending_active.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending_active.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar freigeschaltet.
 

diff --git a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
index f934a95e5e358d1cce16d96070e7d9361aa3fc83..0a6a7e215cb3d644554c8ead50410e29342ea0f0 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 

diff --git a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
index 23b1066b0cc9aefce4c3ae5d1d9ddd152a06e591..79e5fa4b2dd9120a9654c5423cf83b4af2225b0a 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
+++ b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar abgelehnt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_reg.tpl b/templates/de/emails/member/member_surfbar_url_reg.tpl
index a9d7656acba71714b8223143b05c7f0cb1f1ca8c..9699c5e90bb96cd3e07b49f2446cadbd65547d56 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_reg.tpl
+++ b/templates/de/emails/member/member_surfbar_url_reg.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben eine URL im Besuchertausch gebucht.
 

diff --git a/templates/de/emails/member/member_surfbar_url_rejected.tpl b/templates/de/emails/member/member_surfbar_url_rejected.tpl
index 470e23c7d952ef2cd2335d12a19b6b21ce8d3d64..3ab8ccc55f9a449c9d2cb614259177c7c8d1dae4 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_rejected.tpl
+++ b/templates/de/emails/member/member_surfbar_url_rejected.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde von uns in unserer Surfbar abgelehnt. Bitte halten Sie sich an unsere AGBs und binden Sie keine Framekiller in Ihre Webseite ein. Diese stören unsere Surfbar.
 

diff --git a/templates/de/emails/member/member_surfbar_url_rejected_pending.tpl b/templates/de/emails/member/member_surfbar_url_rejected_pending.tpl
index 7ccf0d761a015d5959b8c88d8c369f2e3c289496..d086ea423b7f0f461248607f109d37f4aa14ba82 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_rejected_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_rejected_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre abgelehnte URL erneut angemeldet. Dabei wurde sie auf "Wartend" gestellt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
index 68e0445843a11d0009bc33a966b082d08099f570..b5fea09816c1b5f5e0d1e1b04f39d6562102ddfb 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gestoppte URL gestartet. Dabei wurde sie auf "Wartend" gestellt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
index ed59a49dfc21c1e2588ba81e1168c97bd284d351..946dba09d2ef22f6a54c22242116b6cad9417bc8 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie haben soeben Ihre gestoppte URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 

diff --git a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
index 8e01622881c6ebc5b40961c650bcc7e816b8bf7a..7e21907c51fd159ac4f1aebd77ef391c34719ccb 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
+++ b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten soeben Ihre gestoppte URL geändert. Dabei wurde sie auf "Wartend" gestellt.
 

diff --git a/templates/de/emails/member/member_surfbar_url_unlock.tpl b/templates/de/emails/member/member_surfbar_url_unlock.tpl
index dc36b9fa48203c972923f3f4dba56879fa42b568..075b20abe28865a79c59750b072af2c7b7c134af 100644 (file)
--- a/templates/de/emails/member/member_surfbar_url_unlock.tpl
+++ b/templates/de/emails/member/member_surfbar_url_unlock.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte URL wurde soeben in unsere Surfbar aufgenommen.
 

diff --git a/templates/de/emails/member/member_transfer_recipient.tpl b/templates/de/emails/member/member_transfer_recipient.tpl
index ac59e7a7ae7d83c550706121068e56fd27b8d52e..9245069f24bd7c8159610aa738a0a779db11fe57 100644 (file)
--- a/templates/de/emails/member/member_transfer_recipient.tpl
+++ b/templates/de/emails/member/member_transfer_recipient.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[recipient][userid]%} {%user,surname=$content[recipient][userid]%} {%user,family=$content[recipient][userid]%},
+Hallo {%user,sex,translateSex=$content[recipient][userid]%} {%user,surname=$content[recipient][userid]%} {%user,family=$content[recipient][userid]%},
 
 Sie haben soeben eine {?POINTS?}-Überweisung von einem unserer Mitglieder erhalten!
 

diff --git a/templates/de/emails/member/member_transfer_sender.tpl b/templates/de/emails/member/member_transfer_sender.tpl
index 2dc7a5437ddcef247b8689634e30ed248167913d..afa871e77c890b67b80a991a06323d215c59ded6 100644 (file)
--- a/templates/de/emails/member/member_transfer_sender.tpl
+++ b/templates/de/emails/member/member_transfer_sender.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[sender][userid]%} {%user,surname=$content[sender][userid]%} {%user,family=$content[sender][userid]%},
+Hallo {%user,sex,translateSex=$content[sender][userid]%} {%user,surname=$content[sender][userid]%} {%user,family=$content[sender][userid]%},
 
 Sie haben soeben eine {?POINTS?}-Überweisung an eines unserer Mitglieder abgeschlossen!
 

diff --git a/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl b/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl
index 6013c8e34da7e70593b5c1dae5dface2ee6dde4e..1083af150b02fe6aef161f8a9b5b6a7f4e3de2a8 100644 (file)
--- a/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl
+++ b/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
+Hallo {%user,sex,translateSex=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%},
 
 wir haben soeben Ihre zuvor gelöschte URL im Besuchertausch wiederhergestellt.
 

diff --git a/templates/de/emails/member/member_user_deleted.tpl b/templates/de/emails/member/member_user_deleted.tpl
index 614d9e063cd9056ac21c20b118db4552e0d282ac..d77142923988718b3e03b7093868b10e46095d44 100644 (file)
--- a/templates/de/emails/member/member_user_deleted.tpl
+++ b/templates/de/emails/member/member_user_deleted.tpl
@@ -1,8 +1,8 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Einer unserer Administratoren hat soeben Ihren Account gelöscht!
 
-Grund der Löschung war folgender:
+Grund der Löschung war folsex:
 ------------------------------------
 $content[text]
 ------------------------------------

diff --git a/templates/de/emails/member/member_user_locked.tpl b/templates/de/emails/member/member_user_locked.tpl
index b29e939eff425cfbeafcf20dfdf034d338610808..69614b4e0e585c4ed43adf889e4324b5e046fa35 100644 (file)
--- a/templates/de/emails/member/member_user_locked.tpl
+++ b/templates/de/emails/member/member_user_locked.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 --------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/member/member_user_pool_back.tpl b/templates/de/emails/member/member_user_pool_back.tpl
index 448c19ef20771e8c3433818fbda9ad4c8853cfd9..3a51c12b1213851b4a91a4fdc0a7656db4c9c8a0 100644 (file)
--- a/templates/de/emails/member/member_user_pool_back.tpl
+++ b/templates/de/emails/member/member_user_pool_back.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Eine Buchung von Ihnen konnte nich vollständig ausgesendet werden. Wir haben Ihnen {%pipe,translateComma=$content[points]%} {?POINTS?} wieder gutgeschrieben!
 

diff --git a/templates/de/emails/member/member_user_pool_done.tpl b/templates/de/emails/member/member_user_pool_done.tpl
index c15709fcd85aeefcbd4d5f314b60879c9a7a779f..3d128b577ae2ec5b878258effbbf47bf80d73519 100644 (file)
--- a/templates/de/emails/member/member_user_pool_done.tpl
+++ b/templates/de/emails/member/member_user_pool_done.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Ihre gebuchte Mail wurde soeben vollständig von unserem System versendet! Wir wünschen Ihnen viel Erfolg mit Ihrer Werbebuchung!
 

diff --git a/templates/de/emails/member/member_user_pool_normal.tpl b/templates/de/emails/member/member_user_pool_normal.tpl
index e61e93791c7da4a70356161f10aad18043c04806..6ab79355ab2c736101b87e9807df50c754366e09 100644 (file)
--- a/templates/de/emails/member/member_user_pool_normal.tpl
+++ b/templates/de/emails/member/member_user_pool_normal.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%}, {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%}, {%user,family=$userid%},
 
 Hier kommt eine weitere Mail von einem unserer Mitglieder zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 

diff --git a/templates/de/emails/member/member_user_unlocked.tpl b/templates/de/emails/member/member_user_unlocked.tpl
index 19a6c903c80792c5a7738d564190b6214e7603c9..26b4faefa037af7213d3b95476b70ab22886842d 100644 (file)
--- a/templates/de/emails/member/member_user_unlocked.tpl
+++ b/templates/de/emails/member/member_user_unlocked.tpl
@@ -1,6 +1,6 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
-Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie können sich nun wieder unter folgender URL einloggen:
+Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie können sich nun wieder unter folsex URL einloggen:
 
 ---------------------------
 Mitglied-Id : $userid

diff --git a/templates/de/emails/member/member_wernis_accepted.tpl b/templates/de/emails/member/member_wernis_accepted.tpl
index 8302c08bb3d7de9b7b2e3f697c30a0877f148861..0bf6c7cd7c0e97a90c97952ffdb621c81e755cd1 100644 (file)
--- a/templates/de/emails/member/member_wernis_accepted.tpl
+++ b/templates/de/emails/member/member_wernis_accepted.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_wernis_rejected.tpl b/templates/de/emails/member/member_wernis_rejected.tpl
index 549b7cdb608ba1178bebab6fc2202e3c7a2624ee..cb1d1125118a3e3763a1491d1e8c9cfa19b0ccbf 100644 (file)
--- a/templates/de/emails/member/member_wernis_rejected.tpl
+++ b/templates/de/emails/member/member_wernis_rejected.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns {?MAIN_TITLE?} eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/member/member_wernis_request.tpl b/templates/de/emails/member/member_wernis_request.tpl
index 486aa4fa090db2d094d93ba30bc20cfa06ef14c5..1b2a1873e823387793d46b4d4d02e6b24f9e7ed4 100644 (file)
--- a/templates/de/emails/member/member_wernis_request.tpl
+++ b/templates/de/emails/member/member_wernis_request.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Sie hatten an uns eine Auszahlungsanfrage geschickt.
 
@@ -6,7 +6,7 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 {--MEMBER_YOUR_USERID--} $userid
 ------------------------------
-Anrede: {%user,gender,translateGender=$userid%}
+Anrede: {%user,sex,translateSex=$userid%}
 Vorname: {%user,surname=$userid%}
 Nachname: {%user,family=$userid%}
 Email-Adresse: {%user,email=$userid%}

diff --git a/templates/de/emails/newsletter.tpl b/templates/de/emails/newsletter.tpl
index 298bee6604bea2f81c6b778c3c5190fb94c97cf1..1ae78dbae438aebc4072197d7ef282201c5cff07 100644 (file)
--- a/templates/de/emails/newsletter.tpl
+++ b/templates/de/emails/newsletter.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 --------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/newsletter_html.tpl b/templates/de/emails/newsletter_html.tpl
index 298bee6604bea2f81c6b778c3c5190fb94c97cf1..1ae78dbae438aebc4072197d7ef282201c5cff07 100644 (file)
--- a/templates/de/emails/newsletter_html.tpl
+++ b/templates/de/emails/newsletter_html.tpl
@@ -1,4 +1,4 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+Hallo {%user,sex,translateSex=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 --------------
 {--MEMBER_YOUR_USERID--} $userid

diff --git a/templates/de/emails/sponsor/sponsor_activate.tpl b/templates/de/emails/sponsor/sponsor_activate.tpl
index 88adc8b047164d6a0b4c6548df446323841a62c3..0aabe1574da1b81d9437a80db9290b8ab6b508fb 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_activate.tpl
+++ b/templates/de/emails/sponsor/sponsor_activate.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} (Real: {%server,real_ip_address%})) haben soeben Ihren Bestätigungslink erneut angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_add_points.tpl b/templates/de/emails/sponsor/sponsor_add_points.tpl
index 0151bb5804f3e5426a284266618a8066a10bf1af..a9055a0920408cb9dfb74e91b3b37b2ba6986568 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_add_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_add_points.tpl
@@ -1,8 +1,8 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} Ihrem Sponsoren-Account mit der id $content[id] gutgeschrieben!
 
-Grund dazu war folgender:
+Grund dazu war folsex:
 ------------------------------
 $content[reason]
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl
index 6701bd73711401f408b014c3f210e2a25458a467..7f75332403feef4d5f1a0354525fb64e2b36ad1e 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_data.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_data.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo $content[sex] $content[surname] $content[family],
 
 Sie haben heute Ihre Daten geändert.
 
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position] ({%sponsor,position=$content[id]%})
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident] ({%sponsor,tax_ident=$content[id]%})
 ------------------------------
-{--GENDER--}: $content[gender] ({%sponsor,gender,translateGender=$content[id]%})
+{--SEX--}: $content[sex] ({%sponsor,sex,translateSex=$content[id]%})
 {--SURNAME_FAMILY--}: $content[surname] $content[family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] ({%sponsor,street_nr1=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] ({%sponsor,street_nr2=$content[id]%})

diff --git a/templates/de/emails/sponsor/sponsor_change_email.tpl b/templates/de/emails/sponsor/sponsor_change_email.tpl
index f59990976b6bf26f831ea1dc05bbe28fdfa72383..7e3fe8770b1f87b8aa172e9dfe3ffe98751bafa2 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_email.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_email.tpl
@@ -1,4 +1,4 @@
-Hallo $content[gender] $content[surname] $content[family],
+Hallo $content[sex] $content[surname] $content[family],
 
 Sie haben heute Ihre Email-Adresse geändert. Ihr Account wurde somit temporär gesperrt. Sie können es nun mit dem folgenden Link wieder freigeben:
 

diff --git a/templates/de/emails/sponsor/sponsor_confirm.tpl b/templates/de/emails/sponsor/sponsor_confirm.tpl
index b00e85cb16d501a052aea71a0a1d67c94b7a42aa..97f34c09d836799227f680e5de93f9fc4245dbdd 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_confirm.tpl
+++ b/templates/de/emails/sponsor/sponsor_confirm.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} (Real: {%server,real_ip_address%})) haben sich soeben als Sponsor zu unserem {?mt_word?} angemeldet. Sie haben somit den ersten Schritt zu uns getan wofür wir uns sehr bedanken.
 

diff --git a/templates/de/emails/sponsor/sponsor_deleted.tpl b/templates/de/emails/sponsor/sponsor_deleted.tpl
index 52d727f6254be2cecfbcf000f5082889635d5c5b..7e906dd7b49c41653b12eb0206213c97e540a0c6 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_deleted.tpl
+++ b/templates/de/emails/sponsor/sponsor_deleted.tpl
@@ -1,8 +1,8 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Einer unserer Administratoren hat soeben Ihren Account gelöscht!
 
-Grund der Löschung war folgender:
+Grund der Löschung war folsex:
 ------------------------------------
 $content[reason]
 ------------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_email.tpl b/templates/de/emails/sponsor/sponsor_email.tpl
index 3e156853eb0e90be5685c128a16611b624a93ef1..d6f6c8b0245d35cdc10912c909c8ec36ffd52d34 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_email.tpl
+++ b/templates/de/emails/sponsor/sponsor_email.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie hatten bei uns Ihre EMail-Adresse geändert und den Bestätigungslink erneut angefordert. Hier sind nun alle nötigen Daten dazu.
 

diff --git a/templates/de/emails/sponsor/sponsor_locked.tpl b/templates/de/emails/sponsor/sponsor_locked.tpl
index 35fc5d9e11ff0daab8ed525320113a06edbd2a89..25070ce66d623b624c329328b9bb0bf79d595b09 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_locked.tpl
+++ b/templates/de/emails/sponsor/sponsor_locked.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 --------------------------
 Ihre Sponsor-Id bei uns: $content[id]

diff --git a/templates/de/emails/sponsor/sponsor_lost.tpl b/templates/de/emails/sponsor/sponsor_lost.tpl
index d852ccd2dad4e445c4478a84b693f862a7a1c85f..dcf2c26a5c792976d88e19a4f3fc8bae9f4c691e 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_lost.tpl
+++ b/templates/de/emails/sponsor/sponsor_lost.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} (Real: {%server,real_ip_address%})) haben soeben ein neues Passwort angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_pending.tpl b/templates/de/emails/sponsor/sponsor_pending.tpl
index 6749ad0107aa76c550b9688c944218a75f1e70e7..b33026e299e6d12335bfdf804579c836d80fef0a 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_pending.tpl
+++ b/templates/de/emails/sponsor/sponsor_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie haben soeben Ihre EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} (Real: {%server,real_ip_address%}) aus durchgeführt.
 
@@ -17,7 +17,7 @@ Ihre Sponsor-Id lautet: $content[id]
 ------------------------------
 -- Persönliche Daten:      --
 ------------------------------
-Anrede: {%sponsor,gender,translateGender=$content[id]%}
+Anrede: {%sponsor,sex,translateSex=$content[id]%}
 ------------------------------
 Vorname: {%sponsor,surname=$content[id]%}
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_ref_notify.tpl b/templates/de/emails/sponsor/sponsor_ref_notify.tpl
index bedb5dfd724fe11b859f00c8b16bb3106f825fa8..f6e9313e4a5e877fb1b7fb96c6bebd6b2ae3c0a0 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_ref_notify.tpl
+++ b/templates/de/emails/sponsor/sponsor_ref_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]

diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl
index 4120fee101468b115c89022865a59adadf10fbf7..72762be33252f697a95c4ef11c8a170d4ce03514 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_settings.tpl
+++ b/templates/de/emails/sponsor/sponsor_settings.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie haben heute Ihre Einstellungen geändert.
 

diff --git a/templates/de/emails/sponsor/sponsor_sub_points.tpl b/templates/de/emails/sponsor/sponsor_sub_points.tpl
index 55f0e08ce9cf3da1b6929635a05d11141dd2721f..248d2bf76ec3f38101170e449bb2999ff1ea46b2 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_sub_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_sub_points.tpl
@@ -1,8 +1,8 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} von Ihrem Sponsoren-Account mit der id $content[id] abgezogen!
 
-Grund dazu war folgender:
+Grund dazu war folsex:
 ------------------------------
 $content[reason]
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_unlock.tpl b/templates/de/emails/sponsor/sponsor_unlock.tpl
index 88adc8b047164d6a0b4c6548df446323841a62c3..0aabe1574da1b81d9437a80db9290b8ab6b508fb 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_unlock.tpl
+++ b/templates/de/emails/sponsor/sponsor_unlock.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} (Real: {%server,real_ip_address%})) haben soeben Ihren Bestätigungslink erneut angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_unlocked.tpl b/templates/de/emails/sponsor/sponsor_unlocked.tpl
index 077bf4987585f90771a5abab675d5e6b0fddc5f7..497c40ca68451b3990261a264a5e0af038fb6cde 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_unlocked.tpl
+++ b/templates/de/emails/sponsor/sponsor_unlocked.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
+Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]

diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl
index 09348da8706afff77853267bf13b17512773c575..3fd94a248370cfac22bd9811246ca6fa90922329 100644 (file)
--- a/templates/de/html/admin/admin_add_points.tpl
+++ b/templates/de/html/admin/admin_add_points.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
                        {--ADMIN_ADD_POINTS_TO_USER--}:<br />
-                       [<a href="{%user,email,generateWrappedUserEmailLink=$content[userid]%}">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>]
+                       [<a href="{%user,email,generateWrappedUserEmailLink=$content[userid]%}">{%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>]
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl
index a241a5c0e0c9ab268b190e61672896b4f70a2c93..1a385cb1ae596d5eba657f7ca1c96204410e08c2 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor.tpl
+++ b/templates/de/html/admin/admin_add_sponsor.tpl
@@ -42,10 +42,10 @@
 </tr>
 <tr>
        <td align="right">
-               {--GENDER--}:
+               {--SEX--}:
        </td>
        <td>
-               {%pipe,generateGenderSelectionBox=$content[gender]%}
+               {%pipe,generateSexSelectionBox=$content[sex]%}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_add_tester_user.tpl b/templates/de/html/admin/admin_add_tester_user.tpl
index 4922ba627c7807b37328cd006304647ff246afc5..638c443a9b26aad0c38b19e0a07ecdba42e7507b 100644 (file)
--- a/templates/de/html/admin/admin_add_tester_user.tpl
+++ b/templates/de/html/admin/admin_add_tester_user.tpl
@@ -8,8 +8,8 @@
        <fieldset id="add_tester_user_fields">
                <legend>{--ADMIN_ADD_TESTER_USER_LEGEND--}</legend>
                <div class="admin_input">
-                       <label for="tester_user_family">{--ADMIN_ADD_TESTER_USER_GENDER--}</label>
-                       <div align="left">{%config,generateGenderSelectionBox=tester_user_gender%}</div>
+                       <label for="tester_user_family">{--ADMIN_ADD_TESTER_USER_SEX--}</label>
+                       <div align="left">{%config,generateSexSelectionBox=tester_user_sex%}</div>
                </div>
 
                <div class="clear"></div>

diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl
index edd600ea20f67955d4eee771d30e2a2aba1404ea..46506fe1cf16a6901b6854732832dd90f7f347e3 100644 (file)
--- a/templates/de/html/admin/admin_config_user.tpl
+++ b/templates/de/html/admin/admin_config_user.tpl
@@ -30,8 +30,8 @@
                <div class="clear"></div>
 
                <div class="admin_input">
-                       <label for="tester_user_family">{--ADMIN_CONFIG_TESTER_USER_GENDER--}</label>
-                       <div align="left">$content[tester_user_gender_selection]</div>
+                       <label for="tester_user_family">{--ADMIN_CONFIG_TESTER_USER_SEX--}</label>
+                       <div align="left">$content[tester_user_sex_selection]</div>
                </div>
 
                <div class="clear"></div>

diff --git a/templates/de/html/admin/admin_delete_sponsor.tpl b/templates/de/html/admin/admin_delete_sponsor.tpl
index 9c1d3ea7a8612e0285ccc0800546ad200834b1f9..4e2bc4653e7b4506b97fe05337fe0928dd436b51 100644 (file)
--- a/templates/de/html/admin/admin_delete_sponsor.tpl
+++ b/templates/de/html/admin/admin_delete_sponsor.tpl
@@ -11,7 +11,7 @@
 </div>
 
 <div>
-       {%pipe,translateGender=$content[gender]%} <a href="mailto:$content[email]">$content[surname] $content[family]</a>($content[email])
+       {%pipe,translateSex=$content[sex]%} <a href="mailto:$content[email]">$content[surname] $content[family]</a>($content[email])
 </div>
 
 <div class="bottom">

diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
index d023ca4f781c5231a5cd0529df7a4388470574a8..a2ea2890fd9fde78bb2f26aa1027e2ea04e4898a 100644 (file)
--- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
@@ -42,10 +42,10 @@
 </tr>
 <tr>
        <td width="295" align="right" height="21">
-               {--GENDER--}:
+               {--SEX--}:
        </td>
        <td width="255">
-               {%pipe,generateGenderSelectionBox=$content[gender]%}
+               {%pipe,generateSexSelectionBox=$content[sex]%}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl
index 93c1ae5dc828ac12fe6ee2ff0f1135a86173f15d..8ac7de0f32c8d41d33e85262818fb4a45cef760a 100644 (file)
--- a/templates/de/html/admin/admin_edit_user.tpl
+++ b/templates/de/html/admin/admin_edit_user.tpl
@@ -7,9 +7,9 @@
                </td>
        </tr>
        <tr>
-               <td width="195" align="right" height="21">{--GENDER--}:</td>
+               <td width="195" align="right" height="21">{--SEX--}:</td>
                <td width="195">
-                       {%pipe,generateGenderSelectionBox=$content[gender]%}
+                       {%pipe,generateSexSelectionBox=$content[sex]%}
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl
index bf62f4f0a456168cff5c2c2bdea069a553529efb..8d7168f41db455feb7ff4fe929c17d58f923cc7d 100644 (file)
--- a/templates/de/html/admin/admin_list_autopurge.tpl
+++ b/templates/de/html/admin/admin_list_autopurge.tpl
@@ -7,7 +7,7 @@
 </tr>
 <tr>
        <td class="header_column bottom right" align="center"><strong>{--_USERID--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--GENDER--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--SEX--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--SURNAME--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--FAMILY--}</strong></td>
        <td class="header_column bottom right" align="center"><strong>{--EMAIL--}</strong></td>

diff --git a/templates/de/html/admin/admin_list_autopurge_row.tpl b/templates/de/html/admin/admin_list_autopurge_row.tpl
index 62a3ebc227e381c0c4b67f5845e756c2399c33b6..a886a0d70a42e7be67b54518114963d81304ca83 100644 (file)
--- a/templates/de/html/admin/admin_list_autopurge_row.tpl
+++ b/templates/de/html/admin/admin_list_autopurge_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,gender,translateGender=$content[userid]%}</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,sex,translateSex=$content[userid]%}</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,surname=$content[userid]%}</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">{%user,family=$content[userid]%}</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[email]</td>

diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl
index a69ec87bd547d68244e666a50a7a0a540f96ea66..05edbf372476e78efc3eedfd52ed602e48edc874 100644 (file)
--- a/templates/de/html/admin/admin_list_beg_rows.tpl
+++ b/templates/de/html/admin/admin_list_beg_rows.tpl
@@ -6,7 +6,7 @@
                $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               $content[win1]<a href="$content[email]">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>$content[win2]
+               $content[win1]<a href="$content[email]">{%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
                {%user,beg_points,translateComma=$content[userid]%} {?POINTS?}

diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl
index 25adb72ba726b5ab1128081f312306af0eda6811..0d820155e381923934907acaf6176f96992618b7 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus_rows.tpl
+++ b/templates/de/html/admin/admin_list_bonus_rows.tpl
@@ -6,7 +6,7 @@
                $content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               $content[win1]<a href="$content[email]">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>$content[win2]
+               $content[win1]<a href="$content[email]">{%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>$content[win2]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
                {%pipe,translateComma=$content[points]%} {?POINTS?}

diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl
index 066bfd9f4e8a27c9a5e9dc647a8e0b44c9f9f288..8ec47c2574b2f0c297d4a0d7ad07def40aeb8220 100644 (file)
--- a/templates/de/html/admin/admin_list_links.tpl
+++ b/templates/de/html/admin/admin_list_links.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="4" align="center" class="table_header bottom">
-               {%user,gender,translateGender=$content[userid]%}
+               {%user,sex,translateSex=$content[userid]%}
                {%user,surname=$content[userid]%}
                {%user,family=$content[userid]%}
                {%pipe,generateUserProfileLink=$content[userid]%}:

diff --git a/templates/de/html/admin/admin_list_refs_row.tpl b/templates/de/html/admin/admin_list_refs_row.tpl
index d19c89f9a8ebd5e49fa4da5e700b94e5faa0e1d6..ba3848a6f07a55a3a77d342e5f96e249189fb1a9 100644 (file)
--- a/templates/de/html/admin/admin_list_refs_row.tpl
+++ b/templates/de/html/admin/admin_list_refs_row.tpl
@@ -2,7 +2,7 @@
        <td align="center" class="bottom right {%template,ColorSwitch%}">{%pipe,generateUserProfileLink=$content[userid]%}</td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,refid,generateUserProfileLink=$content[userid]%}</td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">$content[refs_link]</td>
-       <td class="bottom right {%template,ColorSwitch%}">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</td>
+       <td class="bottom right {%template,ColorSwitch%}">{%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</td>
        <td class="bottom right {%template,ColorSwitch%}">$content[email]</td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,status,translateUserStatus=$content[userid]%}</td>
        <td class="bottom {%template,ColorSwitch%}">$content[registered]</td>

diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl
index fb7121ca42b715f70e1f0dc208973ed38b79b790..24797e4942469490f9d085ccb592e02bfe75fef6 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_details.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_details.tpl
@@ -40,7 +40,7 @@
 
 <tr>
        <td align="right" class="bottom right">{--SURNAME_FAMILY--}:</td>
-       <td class="bottom">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</td>
+       <td class="bottom">{%pipe,translateSex=$content[sex]%} $content[surname] $content[family]</td>
 </tr>
 
 <tr>

diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl
index 45f46732127e43ddf18b2cd20131b6f8f9d53942..1cc2c1cccaaac72f07a9901beccb7109d2b0f949 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_row.tpl
@@ -14,7 +14,7 @@
                [<strong><a href="{%url=modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]%}" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</a></strong>]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right" width="240" colspan="2">
-               <a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
+               <a href="$content[email]">{%pipe,translateSex=$content[sex]%} $content[surname] $content[family]</a>
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom" width="160">
                <a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=add_points%}"

diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl
index fae86d2bceac70173579015cb0c4a145ba1f9ad7..de3bedc7f7e74337d8dbcf8d6677b17e22c5088a 100644 (file)
--- a/templates/de/html/admin/admin_list_user_row.tpl
+++ b/templates/de/html/admin/admin_list_user_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--_USERID--}:</strong></td>
-       <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--GENDER--}:</strong></td>
+       <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--SEX--}:</strong></td>
        <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--SURNAME--}:</strong></td>
        <td width="20%" align="center" class="right top {%template,ColorSwitch%}"><strong>{--FAMILY--}:</strong></td>
        <td width="20%" align="center" class="{%template,ColorSwitch%} top"><strong>{--USER_NICKNAME--}:</strong></td>
@@ -8,7 +8,7 @@
 
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">{%pipe,generateUserProfileLink=$content[userid]%}</td>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,gender,translateGender=$content[userid]%}</td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,sex,translateSex=$content[userid]%}</td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,surname=$content[userid]%}</td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">{%user,family=$content[userid]%}</td>
        <td align="center" class="bottom {%template,ColorSwitch%}">{%user,nickname,fixEmptyContentToDashes=$content[userid]%}</td>

diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl
index 374bb4c50dcf501a3f25b8d58a45ea274b445531..903847cbc44db911fbb79ecea3555dc1668a5640 100644 (file)
--- a/templates/de/html/admin/admin_sub_points.tpl
+++ b/templates/de/html/admin/admin_sub_points.tpl
@@ -4,7 +4,7 @@
        <tr>
                <td class="table_header" colspan="2" align="center">
                        {--ADMIN_SUB_POINTS_FROM_USER--}
-                       [<a href="{%user,email,generateWrappedUserEmailLink=$content[userid]%}">{%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>]
+                       [<a href="{%user,email,generateWrappedUserEmailLink=$content[userid]%}">{%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}</a>]
                </td>
        </tr>
 

diff --git a/templates/de/html/admin/admin_unlock_sponsor_row.tpl b/templates/de/html/admin/admin_unlock_sponsor_row.tpl
index 91e727b2ba65ff8d507df08d69e0491aa4bdf0c7..7cbf23c5cbdd5bca8a2e27187dffd277621e145c 100644 (file)
--- a/templates/de/html/admin/admin_unlock_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_unlock_sponsor_row.tpl
@@ -3,7 +3,7 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="id[$content[id]]" class="form_field" value="1" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <a href="{%pipe,generateSponsorEmailLink=$content[email]%}">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
+               <a href="{%pipe,generateSponsorEmailLink=$content[email]%}">{%pipe,translateSex=$content[sex]%} $content[surname] $content[family]</a>
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                $content[remote_addr]

diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index 5bbbb29eb81fb20bb3440b571eab0081801ed3b2..3f59a60f9d1399fe982f772021acb9e0eb5dcee0 100644 (file)
--- a/templates/de/html/admin/admin_user_details.tpl
+++ b/templates/de/html/admin/admin_user_details.tpl
@@ -7,8 +7,8 @@
        </tr>
        <tr>
                <td align="center" width="25%" class="bottom right">
-                       {--GENDER--}:<br />
-                       <strong>{%user,gender,translateGender=$content[userid]%}</strong>
+                       {--SEX--}:<br />
+                       <strong>{%user,sex,translateSex=$content[userid]%}</strong>
                </td>
                <td align="center" width="25%" class="bottom right">
                        {--SURNAME--}:<br />

diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl
index 2f606ca6eb99af44e0dd9ad3fdc33016a6cc934f..1786db1e585ba38c19e82e92437c381939bdecd4 100644 (file)
--- a/templates/de/html/birthday/birthday_msg.tpl
+++ b/templates/de/html/birthday/birthday_msg.tpl
@@ -3,7 +3,7 @@
 </div>
 
 <div class="para">
-       Hallo {%pipe,translateGender=$content[gender]%} $content[surname] $content[family]!
+       Hallo {%pipe,translateSex=$content[sex]%} $content[surname] $content[family]!
 </div>
 
 <div class="para">

diff --git a/templates/de/html/ext/ext_rallye.tpl b/templates/de/html/ext/ext_rallye.tpl
index f98dfafa05008b0a7707616a6dc981954aebc4fe..c66a44c37fd215c9ce8f2b091d29fb3f17cab484 100644 (file)
--- a/templates/de/html/ext/ext_rallye.tpl
+++ b/templates/de/html/ext/ext_rallye.tpl
@@ -1,6 +1,6 @@
 Starten Sie mit dieser Erweiterung vollautomatisierte Rallyes! Nun
 können Sie auch eine mindestens zu erreichende Mitgliederanzahl und
-Minimum zu belegender Plätze angeben. Nur noch Einrichten und
+Minimum zu belesex Plätze angeben. Nur noch Einrichten und
 Freigeben müssen Sie die Rallye. Den Rest erledigt das Script
 für Sie.
 <strong>Vorsicht!</strong>

diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index 1deb8760a40e165420af33c9ce139bdb7c47a9ad..ae1eaa5f0b6c38be75e16b0620f3d90a592265c9 100644 (file)
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -19,10 +19,10 @@
                <table border="0" cellspacing="0" cellpadding="0" width="100%">
                        <tr>
                                <td class="register_left" align="right">
-                                       {--GENDER--}$content[must_fillout_gender]:
+                                       {--SEX--}$content[must_fillout_sex]:
                                </td>
                                <td class="register_right">
-                                       {%pipe,generateGenderSelectionBox=$content[gender]%}
+                                       {%pipe,generateSexSelectionBox=$content[sex]%}
                                </td>
                        </tr>
 

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 075005eb24a1b9e1fb2b47bf0eb52af382b57706..58b0d02b14f9e87b43c4dbf6ca2de66af8904e4f 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -56,10 +56,10 @@
 </tr>
 <tr>
        <td align="right">
-               {--GENDER--}:
+               {--SEX--}:
        </td>
        <td>
-               {%pipe,generateGenderSelectionBox=$content[gender]%}
+               {%pipe,generateSexSelectionBox=$content[sex]%}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/guest/guest_wernis_registration_form.tpl b/templates/de/html/guest/guest_wernis_registration_form.tpl
index 2494f4e1ec996769b637d5b3a86b63c66369bd9d..7c5a5037eeb0ff7965a0a2996e56bfc58c1a925f 100644 (file)
--- a/templates/de/html/guest/guest_wernis_registration_form.tpl
+++ b/templates/de/html/guest/guest_wernis_registration_form.tpl
@@ -19,10 +19,10 @@
                <table border="0" cellspacing="0" cellpadding="0" width="100%">
                        <tr>
                                <td class="register_left" align="right">
-                                       {--GENDER--}$content[must_fillout_gender]:
+                                       {--SEX--}$content[must_fillout_sex]:
                                </td>
                                <td class="register_right">
-                                       {%pipe,generateGenderSelectionBox=$content[gender]%}
+                                       {%pipe,generateSexSelectionBox=$content[sex]%}
                                </td>
                        </tr>
 

diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl
index 5766e7f926619f8dc2f69b3bb336a95e376a1a78..381b461374c6722c164318b275ddfc4721b371f5 100644 (file)
--- a/templates/de/html/member/member_mydata_edit.tpl
+++ b/templates/de/html/member/member_mydata_edit.tpl
@@ -8,9 +8,9 @@
        </tr>
 
        <tr>
-               <td align="right">{--GENDER--}:</td>
+               <td align="right">{--SEX--}:</td>
                <td>
-                       {%pipe,generateGenderSelectionBox=$content[gender]%}
+                       {%pipe,generateSexSelectionBox=$content[sex]%}
                </td>
        </tr>
 

diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl
index ff70d1668900d44cc186378cf5575beaeef5e0ea..86c3ecc3818591742caef70171141a38cebb31fc 100644 (file)
--- a/templates/de/html/member/member_mydata_overview.tpl
+++ b/templates/de/html/member/member_mydata_overview.tpl
@@ -10,8 +10,8 @@
                <td><strong>{%pipe,getMemberId%}</strong></td>
        </tr>
        <tr>
-               <td align="right">{--GENDER--}:</td>
-               <td><strong>{%user,gender,translateGender%}</strong></td>
+               <td align="right">{--SEX--}:</td>
+               <td><strong>{%user,sex,translateSex%}</strong></td>
        </tr>
        <tr>
                <td align="right">{--SURNAME--}:</td>

diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl
index 4885608fbcde993ee01be0a8fce85b751d4e0db7..3eb68462b1054f98550feb69c55afa6cc439c371 100644 (file)
--- a/templates/de/html/show_bonus_msg.tpl
+++ b/templates/de/html/show_bonus_msg.tpl
@@ -1,7 +1,7 @@
 <div align="center">
 
 <div class="big">
-       Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}!
+       Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}!
 </div>
 
 <div>

diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl
index f61b5544ae50d06cbf096e1f1aecbb4852b52fd9..66bb37d10789d83afa72e419d76d9c7446ab6275 100644 (file)
--- a/templates/de/html/sponsor/sponsor_account_form.tpl
+++ b/templates/de/html/sponsor/sponsor_account_form.tpl
@@ -37,10 +37,10 @@
 </tr>
 <tr>
        <td class="bottom right" align="right" height="27">
-               {--GENDER--}:
+               {--SEX--}:
        </td>
        <td class="bottom">
-               {%pipe,generateGenderSelectionBox=$content[gender]%}
+               {%pipe,generateSexSelectionBox=$content[sex]%}
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/sponsor/sponsor_welcome.tpl b/templates/de/html/sponsor/sponsor_welcome.tpl
index 365a5c00b19d35351912159190c35e01768b91e4..c5b00f34b99c4d22fd1f62244304be02f0fd4584 100644 (file)
--- a/templates/de/html/sponsor/sponsor_welcome.tpl
+++ b/templates/de/html/sponsor/sponsor_welcome.tpl
@@ -1,5 +1,5 @@
 <div class="para">
-       Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}!
+       Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}!
 </div>
 
 <div class="para">

diff --git a/templates/xml/admin_list_data_template.xml b/templates/xml/admin_list_data_template.xml
index 5e5be8661d9e42a4ab3b374d874876480a1d0a80..57f7deca84290c8103cce1408f43c51a4d046a79 100644 (file)
--- a/templates/xml/admin_list_data_template.xml
+++ b/templates/xml/admin_list_data_template.xml
@@ -99,7 +99,7 @@ MA 02110-1301 USA
                        always be set), alias (again can be left empty) and SQL function
                        (can also be left empty) which shall be applied on the column.
                        //-->
-                       <select-data-from-list-entry type="string" table="dt" value="gender" alias="" function="" />
+                       <select-data-from-list-entry type="string" table="dt" value="sex" alias="" function="" />
                        <select-data-from-list-entry type="string" table="dt" value="surname" alias="" function="" />
                        <select-data-from-list-entry type="string" table="dt" value="family" alias="" function="" />
                        <select-data-from-list-entry type="string" table="dt" value="last_online" alias="" function="" />
@@ -143,13 +143,13 @@ MA 02110-1301 USA
        <column-callback-list>
                <!--
                A single entry for call-back informations. In this example we want to
-               "translate" the gender information into human-readable.
+               "translate" the sex information into human-readable.
                //-->
                <column-callback-list-entry>
                        <!--
                        The actual data.
                        //-->
-                       <column-callback-data type="string" value="gender" callback="translateGender" />
+                       <column-callback-data type="string" value="sex" callback="translateSex" />
                </column-callback-list-entry>
                <!--
                Another column, now we need a second parameter here because