diff -u -r ocs-2.3.6/classes/author/form/submit/AuthorSubmitStep1Form.inc.php conference/classes/author/form/submit/AuthorSubmitStep1Form.inc.php --- ocs-2.3.6/classes/author/form/submit/AuthorSubmitStep1Form.inc.php 2014-05-28 18:53:37.000000000 +0300 +++ conference/classes/author/form/submit/AuthorSubmitStep1Form.inc.php 2017-02-26 17:44:55.109748356 +0200 @@ -137,14 +137,14 @@ $this->paper->setCurrentStage(REVIEW_STAGE_PRESENTATION); break; } - + $locale = $conference->getPrimaryLocale(); // Set user to initial author $user =& Request::getUser(); $author = new Author(); - $author->setFirstName($user->getFirstName()); - $author->setMiddleName($user->getMiddleName()); - $author->setLastName($user->getLastName()); - $author->setAffiliation($user->getAffiliation()); + $author->setFirstName($user->getFirstName($locale)); + $author->setMiddleName($user->getMiddleName($locale)); + $author->setLastName($user->getLastName($locale)); + $author->setAffiliation($user->getAffiliation($locale)); $author->setCountry($user->getCountry()); $author->setEmail($user->getEmail()); $author->setUrl($user->getUrl()); diff -u -r ocs-2.3.6/classes/manager/form/UserManagementForm.inc.php conference/classes/manager/form/UserManagementForm.inc.php --- ocs-2.3.6/classes/manager/form/UserManagementForm.inc.php 2014-05-28 18:53:37.000000000 +0300 +++ conference/classes/manager/form/UserManagementForm.inc.php 2017-02-26 14:58:36.153864249 +0200 @@ -125,18 +125,18 @@ $this->_data = array( 'authId' => $user->getAuthId(), 'username' => $user->getUsername(), - 'salutation' => $user->getSalutation(), - 'firstName' => $user->getFirstName(), - 'middleName' => $user->getMiddleName(), - 'lastName' => $user->getLastName(), + 'salutation' => $user->getSalutation(null), // Localized + 'firstName' => $user->getFirstName(null), // Localized + 'middleName' => $user->getMiddleName(null), // Localized + 'lastName' => $user->getLastName(null), // Localized 'initials' => $user->getInitials(), 'gender' => $user->getGender(), - 'affiliation' => $user->getAffiliation(), + 'affiliation' => $user->getAffiliation(null), // Localized 'email' => $user->getEmail(), 'userUrl' => $user->getUrl(), 'phone' => $user->getPhone(), 'fax' => $user->getFax(), - 'mailingAddress' => $user->getMailingAddress(), + 'mailingAddress' => $user->getMailingAddress(null), // Localized 'country' => $user->getCountry(), 'biography' => $user->getBiography(null), // Localized 'interests' => $user->getInterests(null), // Localized @@ -226,18 +226,18 @@ $user = new User(); } - $user->setSalutation($this->getData('salutation')); - $user->setFirstName($this->getData('firstName')); - $user->setMiddleName($this->getData('middleName')); - $user->setLastName($this->getData('lastName')); + $user->setSalutation($this->getData('salutation'), null); // Localized + $user->setFirstName($this->getData('firstName'), null); // Localized + $user->setMiddleName($this->getData('middleName'), null); // Localized + $user->setLastName($this->getData('lastName'), null); // Localized $user->setInitials($this->getData('initials')); $user->setGender($this->getData('gender')); - $user->setAffiliation($this->getData('affiliation')); + $user->setAffiliation($this->getData('affiliation'), null); // Localized $user->setEmail($this->getData('email')); $user->setUrl($this->getData('userUrl')); $user->setPhone($this->getData('phone')); $user->setFax($this->getData('fax')); - $user->setMailingAddress($this->getData('mailingAddress')); + $user->setMailingAddress($this->getData('mailingAddress'), null); // Localized $user->setCountry($this->getData('country')); $user->setBiography($this->getData('biography'), null); // Localized $user->setInterests($this->getData('interests'), null); // Localized diff -u -r ocs-2.3.6/classes/registration/form/UserRegistrationForm.inc.php conference/classes/registration/form/UserRegistrationForm.inc.php --- ocs-2.3.6/classes/registration/form/UserRegistrationForm.inc.php 2014-05-28 18:53:37.000000000 +0300 +++ conference/classes/registration/form/UserRegistrationForm.inc.php 2017-02-26 14:58:36.153864249 +0200 @@ -192,18 +192,18 @@ $user = new User(); $user->setUsername($this->getData('username')); - $user->setSalutation($this->getData('salutation')); - $user->setFirstName($this->getData('firstName')); - $user->setMiddleName($this->getData('middleName')); + $user->setSalutation($this->getData('salutation'), null); // Localized + $user->setFirstName($this->getData('firstName', null)); // Localized + $user->setMiddleName($this->getData('middleName'), null); // Localized $user->setInitials($this->getData('initials')); - $user->setLastName($this->getData('lastName')); - $user->setAffiliation($this->getData('affiliation')); + $user->setLastName($this->getData('lastName'), null); // Localized + $user->setAffiliation($this->getData('affiliation'), null); // Localized $user->setSignature($this->getData('signature'), null); // Localized $user->setEmail($this->getData('email')); $user->setUrl($this->getData('userUrl')); $user->setPhone($this->getData('phone')); $user->setFax($this->getData('fax')); - $user->setMailingAddress($this->getData('mailingAddress')); + $user->setMailingAddress($this->getData('mailingAddress'), null); // Localized $user->setBiography($this->getData('biography'), null); // Localized $user->setInterests($this->getData('interests'), null); // Localized $user->setDateRegistered(Core::getCurrentDate()); diff -u -r ocs-2.3.6/classes/trackDirector/form/CreateReviewerForm.inc.php conference/classes/trackDirector/form/CreateReviewerForm.inc.php --- ocs-2.3.6/classes/trackDirector/form/CreateReviewerForm.inc.php 2014-05-28 18:53:37.000000000 +0300 +++ conference/classes/trackDirector/form/CreateReviewerForm.inc.php 2017-02-26 14:58:36.153864249 +0200 @@ -122,18 +122,18 @@ $userDao =& DAORegistry::getDAO('UserDAO'); $user = new User(); - $user->setSalutation($this->getData('salutation')); - $user->setFirstName($this->getData('firstName')); - $user->setMiddleName($this->getData('middleName')); - $user->setLastName($this->getData('lastName')); + $user->setSalutation($this->getData('salutation'), null); // Localized + $user->setFirstName($this->getData('firstName'), null); // Localized + $user->setMiddleName($this->getData('middleName'), null); // Localized + $user->setLastName($this->getData('lastName'), null); // Localized $user->setGender($this->getData('gender')); $user->setInitials($this->getData('initials')); - $user->setAffiliation($this->getData('affiliation')); + $user->setAffiliation($this->getData('affiliation'), null); // Localized $user->setEmail($this->getData('email')); $user->setUrl($this->getData('userUrl')); $user->setPhone($this->getData('phone')); $user->setFax($this->getData('fax')); - $user->setMailingAddress($this->getData('mailingAddress')); + $user->setMailingAddress($this->getData('mailingAddress'), null); // Localized $user->setCountry($this->getData('country')); $user->setBiography($this->getData('biography'), null); // Localized $user->setInterests($this->getData('interests'), null); // Localized diff -u -r ocs-2.3.6/classes/user/form/CreateAccountForm.inc.php conference/classes/user/form/CreateAccountForm.inc.php --- ocs-2.3.6/classes/user/form/CreateAccountForm.inc.php 2014-05-28 18:53:37.000000000 +0300 +++ conference/classes/user/form/CreateAccountForm.inc.php 2017-02-26 14:58:36.153864249 +0200 @@ -229,19 +229,19 @@ $user = new User(); $user->setUsername($this->getData('username')); - $user->setSalutation($this->getData('salutation')); - $user->setFirstName($this->getData('firstName')); - $user->setMiddleName($this->getData('middleName')); + $user->setSalutation($this->getData('salutation'), null); // Localized + $user->setFirstName($this->getData('firstName'), null); // Localized + $user->setMiddleName($this->getData('middleName'), null); // Localized $user->setInitials($this->getData('initials')); - $user->setLastName($this->getData('lastName')); + $user->setLastName($this->getData('lastName'), null); // Localized $user->setGender($this->getData('gender')); - $user->setAffiliation($this->getData('affiliation')); + $user->setAffiliation($this->getData('affiliation'), null); // Localized $user->setSignature($this->getData('signature'), null); // Localized $user->setEmail($this->getData('email')); $user->setUrl($this->getData('userUrl')); $user->setPhone($this->getData('phone')); $user->setFax($this->getData('fax')); - $user->setMailingAddress($this->getData('mailingAddress')); + $user->setMailingAddress($this->getData('mailingAddress'), null); // Localized $user->setBiography($this->getData('biography'), null); // Localized $user->setInterests($this->getData('interests'), null); // Localized $user->setDateRegistered(Core::getCurrentDate()); diff -u -r ocs-2.3.6/classes/user/form/ProfileForm.inc.php conference/classes/user/form/ProfileForm.inc.php --- ocs-2.3.6/classes/user/form/ProfileForm.inc.php 2014-05-28 18:53:37.000000000 +0300 +++ conference/classes/user/form/ProfileForm.inc.php 2017-02-26 14:58:36.153864249 +0200 @@ -167,19 +167,19 @@ $user =& Request::getUser(); $this->_data = array( - 'salutation' => $user->getSalutation(), - 'firstName' => $user->getFirstName(), - 'middleName' => $user->getMiddleName(), + 'salutation' => $user->getSalutation(null), // Localized + 'firstName' => $user->getFirstName(null), // Localized + 'middleName' => $user->getMiddleName(null), // Localized 'initials' => $user->getInitials(), - 'lastName' => $user->getLastName(), + 'lastName' => $user->getLastName(null), // Localized 'gender' => $user->getGender(), - 'affiliation' => $user->getAffiliation(), + 'affiliation' => $user->getAffiliation(null), // Localized 'signature' => $user->getSignature(null), // Localized 'email' => $user->getEmail(), 'userUrl' => $user->getUrl(), 'phone' => $user->getPhone(), 'fax' => $user->getFax(), - 'mailingAddress' => $user->getMailingAddress(), + 'mailingAddress' => $user->getMailingAddress(null), // Localized 'country' => $user->getCountry(), 'timeZone' => $user->getTimeZone(), 'biography' => $user->getBiography(null), // Localized @@ -232,19 +232,19 @@ function execute() { $user =& Request::getUser(); - $user->setSalutation($this->getData('salutation')); - $user->setFirstName($this->getData('firstName')); - $user->setMiddleName($this->getData('middleName')); - $user->setLastName($this->getData('lastName')); + $user->setSalutation($this->getData('salutation'), null); // Localized + $user->setFirstName($this->getData('firstName'), null); // Localized + $user->setMiddleName($this->getData('middleName'), null); // Localized + $user->setLastName($this->getData('lastName'), null); // Localized $user->setGender($this->getData('gender')); $user->setInitials($this->getData('initials')); - $user->setAffiliation($this->getData('affiliation')); + $user->setAffiliation($this->getData('affiliation'), null); // Localized $user->setSignature($this->getData('signature'), null); // Localized $user->setEmail($this->getData('email')); $user->setUrl($this->getData('userUrl')); $user->setPhone($this->getData('phone')); $user->setFax($this->getData('fax')); - $user->setMailingAddress($this->getData('mailingAddress')); + $user->setMailingAddress($this->getData('mailingAddress'), null); // Localized $user->setCountry($this->getData('country')); $user->setTimeZone($this->getData('timeZone')); $user->setBiography($this->getData('biography'), null); // Localized diff -u -r ocs-2.3.6/config.inc.php conference/config.inc.php --- ocs-2.3.6/config.inc.php 2014-05-28 18:55:28.000000000 +0300 +++ conference/config.inc.php 2017-02-26 14:55:20.316461675 +0200 @@ -53,9 +53,13 @@ date_format_trunc = "%m-%d" date_format_short = "%Y-%m-%d" date_format_long = "%B %e, %Y" +date_format_long_uk_UA = "%e %B %Y" +date_format_noyear = "%B %e" +date_format_noyear_uk_UA = "%e %B" datetime_format_short = "%Y-%m-%d %I:%M %p" datetime_format_long = "%B %e, %Y - %I:%M %p" -time_format = "%I:%M %p" +datetime_format_long_uk_UA = "%e %B %Y - %I:%M %p" +time_format = "%k:%M" ; Use URL parameters instead of CGI PATH_INFO. This is useful for ; broken server setups that don't support the PATH_INFO environment diff -u -r ocs-2.3.6/lib/pkp/classes/template/PKPTemplateManager.inc.php conference/lib/pkp/classes/template/PKPTemplateManager.inc.php --- ocs-2.3.6/lib/pkp/classes/template/PKPTemplateManager.inc.php 2014-05-28 18:55:27.000000000 +0300 +++ conference/lib/pkp/classes/template/PKPTemplateManager.inc.php 2017-02-26 14:58:36.157864277 +0200 @@ -87,16 +87,22 @@ $this->assign('requiresFormRequest', $request->isPost()); if (is_a($router, 'PKPPageRouter')) $this->assign('requestedPage', $router->getRequestedPage($request)); $this->assign('currentUrl', $request->getCompleteUrl()); + + $locale = AppLocale::getLocale(); + $this->assign('currentLocale', $locale); + $this->assign('dateFormatTrunc', Config::getVar('general', 'date_format_trunc')); $this->assign('dateFormatShort', Config::getVar('general', 'date_format_short')); $this->assign('dateFormatLong', Config::getVar('general', 'date_format_long')); + if (Config::getvar('general', 'date_format_long_' . $locale)) $this->assign('dateFormatLong', Config::getVar('general', 'date_format_long_' . $locale)); + $this->assign('dateFormatNoyear', Config::getVar('general', 'date_format_noyear')); + if (Config::getvar('general', 'date_format_noyear_' . $locale)) $this->assign('dateFormatNoyear', Config::getVar('general', 'date_format_noyear_' . $locale)); $this->assign('datetimeFormatShort', Config::getVar('general', 'datetime_format_short')); $this->assign('datetimeFormatLong', Config::getVar('general', 'datetime_format_long')); + if (Config::getvar('general', 'datetime_format_long_' . $locale)) $this->assign('datetimeFormatLong', Config::getVar('general', 'datetime_format_long_' . $locale)); $this->assign('timeFormat', Config::getVar('general', 'time_format')); $this->assign('allowCDN', Config::getVar('general', 'enable_cdn')); - $locale = AppLocale::getLocale(); - $this->assign('currentLocale', $locale); // If there's a locale-specific stylesheet, add it. if (($localeStyleSheet = AppLocale::getLocaleStyleSheet($locale)) != null) $this->addStyleSheet($request->getBaseUrl() . '/' . $localeStyleSheet); diff -u -r ocs-2.3.6/lib/pkp/classes/user/PKPUserDAO.inc.php conference/lib/pkp/classes/user/PKPUserDAO.inc.php --- ocs-2.3.6/lib/pkp/classes/user/PKPUserDAO.inc.php 2014-05-28 18:55:27.000000000 +0300 +++ conference/lib/pkp/classes/user/PKPUserDAO.inc.php 2017-02-26 14:58:36.157864277 +0200 @@ -154,18 +154,18 @@ $user->setId($row['user_id']); $user->setUsername($row['username']); $user->setPassword($row['password']); - $user->setSalutation($row['salutation']); - $user->setFirstName($row['first_name']); - $user->setMiddleName($row['middle_name']); +// $user->setSalutation($row['salutation']); +// $user->setFirstName($row['first_name']); +// $user->setMiddleName($row['middle_name']); $user->setInitials($row['initials']); - $user->setLastName($row['last_name']); +// $user->setLastName($row['last_name']); $user->setGender($row['gender']); - $user->setAffiliation($row['affiliation']); +// $user->setAffiliation($row['affiliation']); $user->setEmail($row['email']); $user->setUrl($row['url']); $user->setPhone($row['phone']); $user->setFax($row['fax']); - $user->setMailingAddress($row['mailing_address']); +// $user->setMailingAddress($row['mailing_address']); $user->setCountry($row['country']); $user->setLocales(isset($row['locales']) && !empty($row['locales']) ? explode(':', $row['locales']) : array()); $user->setDateLastEmail($this->datetimeFromDB($row['date_last_email'])); @@ -196,25 +196,19 @@ } $this->update( sprintf('INSERT INTO users - (username, password, salutation, first_name, middle_name, initials, last_name, gender, affiliation, email, url, phone, fax, mailing_address, country, locales, date_last_email, date_registered, date_validated, date_last_login, must_change_password, disabled, disabled_reason, auth_id, auth_str) + (username, password, initials, gender, email, url, phone, fax, country, locales, date_last_email, date_registered, date_validated, date_last_login, must_change_password, disabled, disabled_reason, auth_id, auth_str) VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, %s, %s, %s, %s, ?, ?, ?, ?, ?)', + (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, %s, %s, %s, %s, ?, ?, ?, ?, ?)', $this->datetimeToDB($user->getDateLastEmail()), $this->datetimeToDB($user->getDateRegistered()), $this->datetimeToDB($user->getDateValidated()), $this->datetimeToDB($user->getDateLastLogin())), array( $user->getUsername(), $user->getPassword(), - $user->getSalutation(), - $user->getFirstName(), - $user->getMiddleName(), $user->getInitials(), - $user->getLastName(), $user->getGender(), - $user->getAffiliation(), $user->getEmail(), $user->getUrl(), $user->getPhone(), $user->getFax(), - $user->getMailingAddress(), $user->getCountry(), join(':', $user->getLocales()), $user->getMustChangePassword() ? 1 : 0, @@ -231,7 +225,7 @@ } function getLocaleFieldNames() { - return array('biography', 'signature', 'interests', 'gossip'); + return array('biography', 'signature', 'interests', 'gossip', 'salutation', 'firstName', 'middleName', 'lastName', 'affiliation', 'mailingAddress'); } function updateLocaleFields(&$user) { @@ -255,18 +249,12 @@ sprintf('UPDATE users SET username = ?, password = ?, - salutation = ?, - first_name = ?, - middle_name = ?, initials = ?, - last_name = ?, gender = ?, - affiliation = ?, email = ?, url = ?, phone = ?, fax = ?, - mailing_address = ?, country = ?, locales = ?, date_last_email = %s, @@ -282,18 +270,12 @@ array( $user->getUsername(), $user->getPassword(), - $user->getSalutation(), - $user->getFirstName(), - $user->getMiddleName(), $user->getInitials(), - $user->getLastName(), $user->getGender(), - $user->getAffiliation(), $user->getEmail(), $user->getUrl(), $user->getPhone(), $user->getFax(), - $user->getMailingAddress(), $user->getCountry(), join(':', $user->getLocales()), $user->getMustChangePassword() ? 1 : 0, diff -u -r ocs-2.3.6/lib/pkp/classes/user/PKPUser.inc.php conference/lib/pkp/classes/user/PKPUser.inc.php --- ocs-2.3.6/lib/pkp/classes/user/PKPUser.inc.php 2014-05-28 18:55:27.000000000 +0300 +++ conference/lib/pkp/classes/user/PKPUser.inc.php 2017-02-26 14:58:36.157864277 +0200 @@ -130,33 +130,41 @@ * Get first name. * @return string */ - function getFirstName() { - return $this->getData('firstName'); + function getFirstName($locale) { + return $this->getData('firstName', $locale); + } + + function getLocalizedFirstName() { + return $this->getLocalizedData('firstName'); } /** * Set first name. * @param $firstName string */ - function setFirstName($firstName) + function setFirstName($firstName, $locale) { - return $this->setData('firstName', $firstName); + return $this->setData('firstName', $firstName, $locale); } /** * Get middle name. * @return string */ - function getMiddleName() { - return $this->getData('middleName'); + function getMiddleName($locale) { + return $this->getData('middleName', $locale); + } + + function getLocalizedMiddleName() { + return $this->getLocalizedData('middleName'); } /** * Set middle name. * @param $middleName string */ - function setMiddleName($middleName) { - return $this->setData('middleName', $middleName); + function setMiddleName($middleName, $locale) { + return $this->setData('middleName', $middleName, $locale); } /** @@ -166,7 +174,6 @@ function getInitials() { return $this->getData('initials'); } - /** * Set initials. * @param $initials string @@ -179,32 +186,44 @@ * Get last name. * @return string */ - function getLastName() { - return $this->getData('lastName'); + function getLastName($locale) { + return $this->getData('lastName', $locale); + } + + function getLocalizedLastName() { + return $this->getLocalizedData('lastName'); } /** * Set last name. * @param $lastName string */ - function setLastName($lastName) { - return $this->setData('lastName', $lastName); + function setLastName($lastName, $locale) { + return $this->setData('lastName', $lastName, $locale); } /** * Get user salutation. * @return string */ - function getSalutation() { - return $this->getData('salutation'); + function getSalutation($locale) { + return $this->getData('salutation', $locale); } /** + * Get Localized salutation + */ + function getLocalizedSalutation() { + return $this->getLocalizedData('salutation'); + } + + + /** * Set user salutation. * @param $salutation string */ - function setSalutation($salutation) { - return $this->setData('salutation', $salutation); + function setSalutation($salutation, $locale) { + return $this->setData('salutation', $salutation, $locale); } /** @@ -227,16 +246,20 @@ * Get affiliation (position, institution, etc.). * @return string */ - function getAffiliation() { - return $this->getData('affiliation'); + function getAffiliation($locale) { + return $this->getData('affiliation', $locale); + } + + function getLocalizedAffiliation() { + return $this->getLocalizedData('affiliation'); } /** * Set affiliation. * @param $affiliation string */ - function setAffiliation($affiliation) { - return $this->setData('affiliation', $affiliation); + function setAffiliation($affiliation, $locale) { + return $this->setData('affiliation', $affiliation, $locale); } /** @@ -307,16 +330,20 @@ * Get mailing address. * @return string */ - function getMailingAddress() { - return $this->getData('mailingAddress'); + function getMailingAddress($locale) { + return $this->getData('mailingAddress', $locale); + } + + function getLocalizedMailingAddress() { + return $this->getLocalizedData('mailingAddress'); } /** * Set mailing address. * @param $mailingAddress string */ - function setMailingAddress($mailingAddress) { - return $this->setData('mailingAddress', $mailingAddress); + function setMailingAddress($mailingAddress, $locale) { + return $this->setData('mailingAddress', $mailingAddress, $locale); } /** @@ -580,10 +607,10 @@ * @return string */ function getFullName($lastFirst = false) { - $salutation = $this->getData('salutation'); - $firstName = $this->getData('firstName'); - $middleName = $this->getData('middleName'); - $lastName = $this->getData('lastName'); + $salutation = $this->getLocalizedData('salutation'); + $firstName = $this->getLocalizedFirstName(); + $middleName = $this->getLocalizedMiddleName(); + $lastName = $this->getLocalizedLastName(); if ($lastFirst) { return "$lastName, " . ($salutation != ''?"$salutation ":'') . "$firstName" . ($middleName != ''?" $middleName":''); } else { @@ -593,7 +620,7 @@ function getContactSignature() { $signature = $this->getFullName(); - if ($this->getAffiliation()) $signature .= "\n" . $this->getAffiliation(); + if ($this->getLocalizedAffiliation()) $signature .= "\n" . $this->getLocalizedAffiliation(); if ($this->getPhone()) $signature .= "\n" . __('user.phone') . ' ' . $this->getPhone(); if ($this->getFax()) $signature .= "\n" . __('user.fax') . ' ' . $this->getFax(); $signature .= "\n" . $this->getEmail(); diff -u -r ocs-2.3.6/lib/pkp/lib/smarty/plugins/modifier.date_format.php conference/lib/pkp/lib/smarty/plugins/modifier.date_format.php --- ocs-2.3.6/lib/pkp/lib/smarty/plugins/modifier.date_format.php 2014-05-28 18:55:27.000000000 +0300 +++ conference/lib/pkp/lib/smarty/plugins/modifier.date_format.php 2017-02-26 14:58:36.157864277 +0200 @@ -50,7 +50,13 @@ } $format = str_replace($_win_from, $_win_to, $format); } - return strftime($format, $timestamp); + /* hack for uk_UA*/ + $_ua_monthes_ori = array("січень", "лютий", "березень", "квітень", "травень", "червень", "липень", "серпень", "вересень", "жовтень", "листопад", "грудень"); + $_ua_monthes_fix = array("січня", "лютого", "березня", "квітня", "травня", "червня", "липня", "серпня", "вересня", "жовтня", "листопада", "грудня"); + $_fdate = strftime($format, $timestamp); + // if ($currentlocale == 'uk_UA') + $_fdate = str_replace($_ua_monthes_ori, $_ua_monthes_fix, $_fdate); + return $_fdate; } /* vim: set expandtab: */ diff -u -r ocs-2.3.6/registry/locales.xml conference/registry/locales.xml --- ocs-2.3.6/registry/locales.xml 2014-05-28 18:53:37.000000000 +0300 +++ conference/registry/locales.xml 2017-02-26 14:48:15.381335815 +0200 @@ -28,5 +28,6 @@ <locale key="it_IT" complete="false" name="Italiano"/> <locale key="pt_BR" name="Português (Brasil)"/> <locale key="pt_PT" complete="false" name="Português (Portugal)"/> + <locale key="uk_UA" complete="false" name="Українська"/> <locale key="zh_TW" complete="false" name="正體中文"/> </locales> diff -u -r ocs-2.3.6/templates/about/organizingTeamBio.tpl conference/templates/about/organizingTeamBio.tpl --- ocs-2.3.6/templates/about/organizingTeamBio.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/about/organizingTeamBio.tpl 2017-02-26 14:58:36.157864277 +0200 @@ -76,7 +76,7 @@ <p> <em>{$user->getFullName()|escape}</em> {icon name="mail" url=$address}<br /> {if $user->getUrl()}<a href="{$user->getUrl()|escape:"quotes"}" target="_new">{$user->getUrl()|escape}</a><br/>{/if} - {if $user->getAffiliation()}{$user->getAffiliation()|escape}{assign var=needsComma value=1}{/if}{if $country}{if $needsComma}, {/if}{$country|escape}{/if} + {if $user->getLocalizedAffiliation()}{$user->getLocalizedAffiliation()|escape}{assign var=needsComma value=1}{/if}{if $country}{if $needsComma}, {/if}{$country|escape}{/if} </p> <p>{$user->getLocalizedBiography()|nl2br|strip_unsafe_html}</p> diff -u -r ocs-2.3.6/templates/about/organizingTeamBoard.tpl conference/templates/about/organizingTeamBoard.tpl --- ocs-2.3.6/templates/about/organizingTeamBoard.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/about/organizingTeamBoard.tpl 2017-02-26 14:58:36.157864277 +0200 @@ -21,7 +21,7 @@ <ol class="organizingTeam"> {foreach from=$members item=member} {assign var=user value=$member->getUser()} - <li><a href="javascript:openRTWindow('{url op="organizingTeamBio" path=$user->getId()}')">{$user->getFullName()|escape}</a>{if $user->getAffiliation()}, {$user->getAffiliation()|escape}{/if}{if $user->getCountry()}{assign var=countryCode value=$user->getCountry()}{assign var=country value=$countries.$countryCode}, {$country|escape}{/if}</li> + <li><a href="javascript:openRTWindow('{url op="organizingTeamBio" path=$user->getId()}')">{$user->getFullName()|escape}</a>{if $user->getAffiliation()}, {$user->getLocalizedAffiliation()|escape}{/if}{if $user->getCountry()}{assign var=countryCode value=$user->getCountry()}{assign var=country value=$countries.$countryCode}, {$country|escape}{/if}</li> {/foreach}{* $members *} </ol> {/foreach}{* $groups *} diff -u -r ocs-2.3.6/templates/about/organizingTeam.tpl conference/templates/about/organizingTeam.tpl --- ocs-2.3.6/templates/about/organizingTeam.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/about/organizingTeam.tpl 2017-02-26 14:58:36.157864277 +0200 @@ -22,7 +22,7 @@ <ol class="organizingTeam"> {foreach from=$directors item=director} - <li><a href="javascript:openRTWindow('{url op="organizingTeamBio" path=$director->getId()}')">{$director->getFullName()|escape}</a>{if $director->getAffiliation()}, {$director->getAffiliation()|escape}{/if}{if $director->getCountry()}{assign var=countryCode value=$director->getCountry()}{assign var=country value=$countries.$countryCode}, {$country|escape}{/if}</li> + <li><a href="javascript:openRTWindow('{url op="organizingTeamBio" path=$director->getId()}')">{$director->getFullName()|escape}</a>{if $director->getLocalizedAffiliation()}, {$director->getLocalizedAffiliation()|escape}{/if}{if $director->getCountry()}{assign var=countryCode value=$director->getCountry()}{assign var=country value=$countries.$countryCode}, {$country|escape}{/if}</li> {/foreach} </ol> {/if} @@ -36,7 +36,7 @@ <ol class="organizingTeam"> {foreach from=$trackDirectors item=trackDirector} - <li><a href="javascript:openRTWindow('{url op="organizingTeamBio" path=$trackDirector->getId()}')">{$trackDirector->getFullName()|escape}</a>{if $trackDirector->getAffiliation()}, {$trackDirector->getAffiliation()|escape}{/if}{if $trackDirector->getCountry()}{assign var=countryCode value=$trackDirector->getCountry()}{assign var=country value=$countries.$countryCode}, {$country|escape}{/if}</li> + <li><a href="javascript:openRTWindow('{url op="organizingTeamBio" path=$trackDirector->getId()}')">{$trackDirector->getFullName()|escape}</a>{if $trackDirector->getLocalizedAffiliation()}, {$trackDirector->getLocalizedAffiliation()|escape}{/if}{if $trackDirector->getCountry()}{assign var=countryCode value=$trackDirector->getCountry()}{assign var=country value=$countries.$countryCode}, {$country|escape}{/if}</li> {/foreach} </ol> {/if} diff -u -r ocs-2.3.6/templates/comment/comments.tpl conference/templates/comment/comments.tpl --- ocs-2.3.6/templates/comment/comments.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/comment/comments.tpl 2017-02-26 14:58:36.157864277 +0200 @@ -51,7 +51,7 @@ {if $comment->getPosterEmail()} {translate|assign:"emailReply" key="comments.emailReply"} - {mailto text=$emailReply encode="javascript" address=$comment->getPosterEmail() subject=$comment->getTitle()|default:"&nbsp;" extra='class="action"'} + {mailto text=$emailReply encode="none" address=$comment->getPosterEmail() subject=$comment->getTitle()|default:"&nbsp;" extra='class="action"'} {assign var="hasPriorAction" value=1} {/if} @@ -99,7 +99,7 @@ {if $child->getPosterEmail()} {translate|assign:"emailReply" key="comments.emailReply"} - {mailto text=$emailReply encode="javascript" address=$child->getPosterEmail()|escape subject=$child->getTitle()|escape|default:"&nbsp;" extra='class="action"'} + {mailto text=$emailReply encode="none" address=$child->getPosterEmail()|escape subject=$child->getTitle()|escape|default:"&nbsp;" extra='class="action"'} {assign var="hasPriorAction" value=1} {/if} diff -u -r ocs-2.3.6/templates/manager/people/userProfileForm.tpl conference/templates/manager/people/userProfileForm.tpl --- ocs-2.3.6/templates/manager/people/userProfileForm.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/manager/people/userProfileForm.tpl 2017-02-26 14:58:36.157864277 +0200 @@ -95,19 +95,19 @@ {/if} <tr valign="top"> <td class="label">{fieldLabel name="salutation" key="user.salutation"}</td> - <td class="value"><input type="text" name="salutation" id="salutation" value="{$salutation|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="salutation[{$formLocale|escape}]" id="salutation" value="{$salutation[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="firstName" required="true" key="user.firstName"}</td> - <td class="value"><input type="text" name="firstName" id="firstName" value="{$firstName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="firstName[{$formLocale|escape}]" id="firstName" value="{$firstName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="middleName" key="user.middleName"}</td> - <td class="value"><input type="text" name="middleName" id="middleName" value="{$middleName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="middleName[{$formLocale|escape}]" id="middleName" value="{$middleName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="lastName" required="true" key="user.lastName"}</td> - <td class="value"><input type="text" name="lastName" id="lastName" value="{$lastName|escape}" size="20" maxlength="60" class="textField" /></td> + <td class="value"><input type="text" name="lastName[{$formLocale|escape}]" id="lastName" value="{$lastName[$formLocale]|escape}" size="20" maxlength="60" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="gender" key="user.gender"}</td> @@ -189,7 +189,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="affiliation" key="user.affiliation"}</td> <td class="value"> - <textarea name="affiliation" id="affiliation" rows="5" cols="40" class="textArea">{$affiliation|escape}</textarea><br/> + <textarea name="affiliation[{$formLocale|escape}]" id="affiliation" rows="5" cols="40" class="textArea">{$affiliation[$formLocale]|escape}</textarea><br/> <span class="instruct">{translate key="user.affiliation.description"}</span> </td> </tr> @@ -223,7 +223,7 @@ </tr> <tr valign="top"> <td class="label">{fieldLabel name="mailingAddress" key="common.mailingAddress"}</td> - <td class="value"><textarea name="mailingAddress" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress|escape}</textarea></td> + <td class="value"><textarea name="mailingAddress[{$formLocale|escape}]" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress[$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="country" key="common.country"}</td> diff -u -r ocs-2.3.6/templates/manager/people/userProfile.tpl conference/templates/manager/people/userProfile.tpl --- ocs-2.3.6/templates/manager/people/userProfile.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/manager/people/userProfile.tpl 2017-02-26 14:58:36.161864305 +0200 @@ -26,23 +26,23 @@ </tr> <tr valign="top"> <td class="label">{translate key="user.salutation"}</td> - <td class="value">{$user->getSalutation()|escape|default:"&mdash;"}</td> + <td class="value">{$user->getLocalizedSalutation()|escape|default:"&mdash;"}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.firstName"}</td> - <td class="value">{$user->getFirstName()|escape|default:"&mdash;"}</td> + <td class="value">{$user->getLocalizedFirstName()|escape|default:"&mdash;"}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.middleName"}</td> - <td class="value">{$user->getMiddleName()|escape|default:"&mdash;"}</td> + <td class="value">{$user->getLocalizedMiddleName()|escape|default:"&mdash;"}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.lastName"}</td> - <td class="value">{$user->getLastName()|escape|default:"&mdash;"}</td> + <td class="value">{$user->getLocalizedLastName()|escape|default:"&mdash;"}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.affiliation"}</td> - <td class="value">{$user->getAffiliation()|escape|nl2br|default:"&mdash;"}</td> + <td class="value">{$user->getLocalizedAffiliation()|escape|nl2br|default:"&mdash;"}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.signature"}</td> @@ -93,7 +93,7 @@ </tr> <tr valign="top"> <td class="label">{translate key="common.mailingAddress"}</td> - <td class="value">{$user->getMailingAddress()|strip_unsafe_html|nl2br|default:"&mdash;"}</td> + <td class="value">{$user->getLocalizedMailingAddress()|strip_unsafe_html|nl2br|default:"&mdash;"}</td> </tr> <tr valign="top"> <td class="label">{translate key="common.country"}</td> diff -u -r ocs-2.3.6/templates/registration/userRegistrationForm.tpl conference/templates/registration/userRegistrationForm.tpl --- ocs-2.3.6/templates/registration/userRegistrationForm.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/registration/userRegistrationForm.tpl 2017-02-26 14:58:36.161864305 +0200 @@ -174,22 +174,22 @@ <tr valign="top"> <td class="label">{fieldLabel name="salutation" key="user.salutation"}</td> - <td class="value"><input type="text" name="salutation" id="salutation" value="{$salutation|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="salutation[{$formLocale|escape}]" id="salutation" value="{$salutation[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="firstName" required="true" key="user.firstName"}</td> - <td class="value"><input type="text" id="firstName" name="firstName" value="{$firstName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" id="firstName" name="firstName[{$formLocale|escape}]" value="{$firstName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="middleName" key="user.middleName"}</td> - <td class="value"><input type="text" id="middleName" name="middleName" value="{$middleName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" id="middleName[{$formLocale|escape}]" name="middleName" value="{$middleName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="lastName" required="true" key="user.lastName"}</td> - <td class="value"><input type="text" id="lastName" name="lastName" value="{$lastName|escape}" size="20" maxlength="90" class="textField" /></td> + <td class="value"><input type="text" id="lastName[{$formLocale|escape}]" name="lastName" value="{$lastName[$formLocale]|escape}" size="20" maxlength="90" class="textField" /></td> </tr> <tr valign="top"> @@ -199,7 +199,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="affiliation" key="user.affiliation" required="true"}</td> - <td class="value"><textarea id="affiliation" name="affiliation" rows="5" cols="40" class="textArea">{$affiliation|escape}</textarea></td> + <td class="value"><textarea id="affiliation" name="affiliation[{$formLocale|escape}]" rows="5" cols="40" class="textArea">{$affiliation[$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> @@ -229,7 +229,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="mailingAddress" required="true" key="common.mailingAddress"}</td> - <td class="value"><textarea name="mailingAddress" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress|escape}</textarea></td> + <td class="value"><textarea name="mailingAddress[{$formLocale|escape}]" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress[$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> diff -u -r ocs-2.3.6/templates/schedConf/index.tpl conference/templates/schedConf/index.tpl --- ocs-2.3.6/templates/schedConf/index.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/schedConf/index.tpl 2017-02-26 14:58:36.161864305 +0200 @@ -23,7 +23,15 @@ {if $schedConf->getSetting('startDate')} {assign var=startDate value=$schedConf->getSetting('startDate')|date_format:$dateFormatLong} {assign var=endDate value=$schedConf->getSetting('endDate')|date_format:$dateFormatLong} - <h2>{$startDate}{if $startDate != $endDate} &ndash; {$endDate}{/if}</h2> + {assign var=startYear value=$schedConf->getSetting('startDate')|date_format:"%Y"} + {assign var=endYear value=$schedConf->getSetting('endDate')|date_format:"%Y"} + {assign var=startMonth value=$schedConf->getSetting('startDate')|date_format:"%m"} + {assign var=endMonth value=$schedConf->getSetting('endDate')|date_format:"%m"} + {assign var=startDay value=$schedConf->getSetting('startDate')|date_format:"%d"} + {assign var=endDay value=$schedConf->getSetting('endDate')|date_format:"%d"} + {if $startYear == $endYear} {assign var=startDate value=$schedConf->getSetting('startDate')|date_format:$dateFormatNoyear} + {/if} + <h2>{if $starYear != $endYear || $startMonth != $endMonth || $startDay != $endDay} {$startDate} &ndash; {/if}{$endDate}</h2> {/if} <br /> diff -u -r ocs-2.3.6/templates/schedConf/trackPolicies.tpl conference/templates/schedConf/trackPolicies.tpl --- ocs-2.3.6/templates/schedConf/trackPolicies.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/schedConf/trackPolicies.tpl 2017-02-26 14:58:36.161864305 +0200 @@ -31,7 +31,7 @@ {translate key="user.role.directors"} <ul class="plain"> {/if} - <li>{$trackDirector->getFirstName()|escape} {$trackDirector->getLastName()|escape}{if strlen($trackDirector->getAffiliation()) > 0}, {$trackDirector->getAffiliation()|escape}{/if}</li> + <li>{$trackDirector->getLocalizedFirstName()|escape} {$trackDirector->getLocalizedLastName()|escape}{if strlen($trackDirector->getLocalizedAffiliation()) > 0}, {$trackDirector->getLocalizedAffiliation()|escape}{/if}</li> {/foreach} {/if} {/foreach} diff -u -r ocs-2.3.6/templates/trackDirector/createReviewerForm.tpl conference/templates/trackDirector/createReviewerForm.tpl --- ocs-2.3.6/templates/trackDirector/createReviewerForm.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/trackDirector/createReviewerForm.tpl 2017-02-26 14:58:36.161864305 +0200 @@ -55,19 +55,19 @@ {/if} <tr valign="top"> <td class="label">{fieldLabel name="salutation" key="user.salutation"}</td> - <td class="value"><input type="text" name="salutation" id="salutation" value="{$salutation|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="salutation[{$formLocale|escape}]" id="salutation" value="{$salutation[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="firstName" required="true" key="user.firstName"}</td> - <td class="value"><input type="text" name="firstName" id="firstName" value="{$firstName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="firstName[{$formLocale|escape}]" id="firstName" value="{$firstName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="middleName" key="user.middleName"}</td> - <td class="value"><input type="text" name="middleName" id="middleName" value="{$middleName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="middleName[{$formLocale|escape}]" id="middleName" value="{$middleName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="lastName" required="true" key="user.lastName"}</td> - <td class="value"><input type="text" name="lastName" id="lastName" value="{$lastName|escape}" size="20" maxlength="60" class="textField" /></td> + <td class="value"><input type="text" name="lastName[{$formLocale|escape}]" id="lastName" value="{$lastName[$formLocale]|escape}" size="20" maxlength="60" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="initials" key="user.initials"}</td> @@ -96,7 +96,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="affiliation" key="user.affiliation"}</td> <td class="value"> - <textarea name="affiliation" id="affiliation" rows="5" cols="40" class="textArea">{$affiliation|escape}</textarea><br/> + <textarea name="affiliation[{$formLocale|escape}]" id="affiliation" rows="5" cols="40" class="textArea">{$affiliation[$formLocale]|escape}</textarea><br/> <span class="instruct">{translate key="user.affiliation.description"}</span> </td> </tr> @@ -126,7 +126,7 @@ </tr> <tr valign="top"> <td class="label">{fieldLabel name="mailingAddress" key="common.mailingAddress"}</td> - <td class="value"><textarea name="mailingAddress" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress|escape}</textarea></td> + <td class="value"><textarea name="mailingAddress[{$formLocale|escape}]" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress[$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="country" key="common.country"}</td> diff -u -r ocs-2.3.6/templates/trackDirector/userProfile.tpl conference/templates/trackDirector/userProfile.tpl --- ocs-2.3.6/templates/trackDirector/userProfile.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/trackDirector/userProfile.tpl 2017-02-26 14:58:36.161864305 +0200 @@ -18,7 +18,7 @@ <table class="data" width="100%"> <tr valign="top"> <td width="20%" class="label">{translate key="user.salutation"}:</td> - <td width="80%" class="value">{$user->getSalutation()|escape}</td> + <td width="80%" class="value">{$user->getLocalizedSalutation()|escape}</td> </tr> <tr valign="top"> <td width="20%" class="label">{translate key="user.username"}:</td> @@ -26,15 +26,15 @@ </tr> <tr valign="top"> <td class="label">{translate key="user.firstName"}:</td> - <td class="value">{$user->getFirstName()|escape}</td> + <td class="value">{$user->getLocalizedFirstName()|escape}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.middleName"}:</td> - <td class="value">{$user->getMiddleName()|escape}</td> + <td class="value">{$user->getLocalizedMiddleName()|escape}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.lastName"}:</td> - <td class="value">{$user->getLastName()|escape}</td> + <td class="value">{$user->getLocalizedLastName()|escape}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.gender"}</td> @@ -48,7 +48,7 @@ </tr> <tr valign="top"> <td class="label">{translate key="user.affiliation"}:</td> - <td class="value">{$user->getAffiliation()|escape|nl2br}</td> + <td class="value">{$user->getLocalizedAffiliation()|escape|nl2br}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.signature"}:</td> @@ -85,7 +85,7 @@ </tr> <tr valign="top"> <td class="label">{translate key="common.mailingAddress"}:</td> - <td class="value">{$user->getMailingAddress()|strip_unsafe_html|nl2br}</td> + <td class="value">{$user->getLocalizedMailingAddress()|strip_unsafe_html|nl2br}</td> </tr> <tr valign="top"> <td class="label">{translate key="user.biography"}:</td> diff -u -r ocs-2.3.6/templates/user/createAccount.tpl conference/templates/user/createAccount.tpl --- ocs-2.3.6/templates/user/createAccount.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/user/createAccount.tpl 2017-02-26 14:58:36.165864334 +0200 @@ -91,21 +91,21 @@ <tr valign="top"> <td class="label">{fieldLabel name="salutation" key="user.salutation"}</td> - <td class="value"><input type="text" name="salutation" id="salutation" value="{$salutation|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="salutation[{$formLocale|escape}]" id="salutation" value="{$salutation[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="firstName" required="true" key="user.firstName"}</td> - <td class="value"><input type="text" id="firstName" name="firstName" value="{$firstName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" id="firstName" name="firstName[{$formLocale|escape}]" value="{$firstName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="middleName" key="user.middleName"}</td> - <td class="value"><input type="text" id="middleName" name="middleName" value="{$middleName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" id="middleName[{$formLocale|escape}]" name="middleName" value="{$middleName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="lastName" required="true" key="user.lastName"}</td> - <td class="value"><input type="text" id="lastName" name="lastName" value="{$lastName|escape}" size="20" maxlength="90" class="textField" /></td> + <td class="value"><input type="text" id="lastName" name="lastName[{$formLocale|escape}]" value="{$lastName[$formLocale]|escape}" size="20" maxlength="90" class="textField" /></td> </tr> <tr valign="top"> @@ -123,7 +123,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="affiliation" key="user.affiliation" required="true"}</td> - <td class="value"><textarea name="affiliation" rows="5" cols="40" class="textArea">{$affiliation|escape}</textarea></td> + <td class="value"><textarea name="affiliation[{$formLocale|escape}]" rows="5" cols="40" class="textArea">{$affiliation[{$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> @@ -153,7 +153,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="mailingAddress" key="common.mailingAddress"}</td> - <td class="value"><textarea name="mailingAddress" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress|escape}</textarea></td> + <td class="value"><textarea name="mailingAddress[{$formLocale|escape}]" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress[$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> diff -u -r ocs-2.3.6/templates/user/profile.tpl conference/templates/user/profile.tpl --- ocs-2.3.6/templates/user/profile.tpl 2014-05-28 18:53:37.000000000 +0300 +++ conference/templates/user/profile.tpl 2017-02-26 14:58:36.165864334 +0200 @@ -35,19 +35,19 @@ </tr> <tr valign="top"> <td class="label">{fieldLabel name="salutation" key="user.salutation"}</td> - <td class="value"><input type="text" name="salutation" id="salutation" value="{$salutation|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="salutation[{$formLocale|escape}]" id="salutation" value="{$salutation[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="firstName" required="true" key="user.firstName"}</td> - <td class="value"><input type="text" name="firstName" id="firstName" value="{$firstName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="firstName[{$formLocale|escape}]" id="firstName" value="{$firstName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="middleName" key="user.middleName"}</td> - <td class="value"><input type="text" name="middleName" id="middleName" value="{$middleName|escape}" size="20" maxlength="40" class="textField" /></td> + <td class="value"><input type="text" name="middleName[{$formLocale|escape}]" id="middleName" value="{$middleName[$formLocale]|escape}" size="20" maxlength="40" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="lastName" required="true" key="user.lastName"}</td> - <td class="value"><input type="text" name="lastName" id="lastName" value="{$lastName|escape}" size="20" maxlength="90" class="textField" /></td> + <td class="value"><input type="text" name="lastName[{$formLocale|escape}]" id="lastName" value="{$lastName[$formLocale]|escape}" size="20" maxlength="90" class="textField" /></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="initials" key="user.initials"}</td> @@ -64,7 +64,7 @@ <tr valign="top"> <td class="label">{fieldLabel name="affiliation" key="user.affiliation" required="true"}</td> <td class="value"> - <textarea name="affiliation" id="affiliation" rows="5" cols="40" class="textArea">{$affiliation|escape}</textarea><br/> + <textarea name="affiliation[{$formLocale|escape}]" id="affiliation" rows="5" cols="40" class="textArea">{$affiliation[$formLocale]|escape}</textarea><br/> <span class="instruct">{translate key="user.affiliation.description"}</span> </td> </tr> @@ -90,7 +90,7 @@ </tr> <tr valign="top"> <td class="label">{fieldLabel name="mailingAddress" key="common.mailingAddress"}</td> - <td class="value"><textarea name="mailingAddress" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress|escape}</textarea></td> + <td class="value"><textarea name="mailingAddress[{$formLocale|escape}]" id="mailingAddress" rows="3" cols="40" class="textArea">{$mailingAddress[$formLocale]|escape}</textarea></td> </tr> <tr valign="top"> <td class="label">{fieldLabel name="country" key="common.country"}</td>

Simpan