Attachment #2082 for bug #3865




	}

	/**
	 * Return associative array of all locales supported by forms on the site.
	 * These locales are used to provide a language toggle on the main site pages.
	 * @return array
	 */
	function &getSupportedFormLocaleNames() {
		$supportedLocales =& $this->getData('supportedFormLocales');

		if (!isset($supportedLocales)) {
			$supportedLocales = array();
			$localeNames =& Locale::getAllLocales();

			$locales = $this->getSetting('supportedFormLocales');
			if (!isset($locales) || !is_array($locales)) {
				$locales = array();
			}

			foreach ($locales as $localeKey) {
				$supportedLocales[$localeKey] = $localeNames[$localeKey];
			}
		}

		return $supportedLocales;
	}

	/**
	 * Get "localized" conference page title (if applicable).
	 * param $home boolean get homepage title
	 * @return string





class Locale extends PKPLocale {
	/**
	 * Get all supported UI locales for the current context.
	 * @return array
	 */
	function getSupportedLocales() {

	}

	/**
	 * Get all supported form locales for the current context.
	 * @return array
	 */
	function getSupportedFormLocales() {
		static $supportedFormLocales;
		if (!isset($supportedFormLocales)) {
			if (defined('SESSION_DISABLE_INIT') || !Config::getVar('general', 'installed')) {
				$supportedFormLocales = Locale::getAllLocales();
			} elseif (($conference =& Request::getConference())) {
				$supportedFormLocales = $conference->getSupportedFormLocaleNames();
			} else {
				$site =& Request::getSite();
				$supportedFormLocales = $site->getSupportedLocaleNames();
			}
		}
		return $supportedFormLocales;
	}

	/**
	 * Return the key name of the user's currently selected locale (default
	 * is "en_US" for U.S. English).
	 * @return string 

(-)classes/manager/form/LanguageSettingsForm.inc.php (-12 / +24 lines)

Lines 31-37	Link Here

		parent::Form('manager/languageSettings.tpl');

		parent::Form('manager/languageSettings.tpl');

		$this->settings = array(

		$this->settings = array(

			'supportedLocales' => 'object'

			'supportedLocales' => 'object',

			'supportedFormLocales' => 'object'

);

);

		$site =& Request::getSite();

		$site =& Request::getSite();

Lines 67-74	Link Here

		$this->setData('primaryLocale', $conference->getPrimaryLocale());

		$this->setData('primaryLocale', $conference->getPrimaryLocale());

		if ($this->getData('supportedLocales') == null || !is_array($this->getData('supportedLocales'))) {

		foreach (array('supportedFormLocales', 'supportedLocales') as $name) {

			$this->setData('supportedLocales', array());

			if ($this->getData($name) == null || !is_array($this->getData($name))) {

				$this->setData($name, array());

Lines 80-87	Link Here

		$vars[] = 'primaryLocale';

		$vars[] = 'primaryLocale';

		$this->readUserVars($vars);

		$this->readUserVars($vars);

		if ($this->getData('supportedLocales') == null || !is_array($this->getData('supportedLocales'))) {

		foreach (array('supportedFormLocales', 'supportedLocales') as $name) {

			$this->setData('supportedLocales', array());

			if ($this->getData($name) == null || !is_array($this->getData($name))) {

				$this->setData($name, array());

Lines 93-111	Link Here

		$settingsDao =& DAORegistry::getDAO('ConferenceSettingsDAO');

		$settingsDao =& DAORegistry::getDAO('ConferenceSettingsDAO');

		// Verify additional locales

100

		// Verify additional locales

		$supportedLocales = array();

101

		foreach (array('supportedLocales', 'supportedFormLocales') as $name) {

		foreach ($this->getData('supportedLocales') as $locale) {

102

			$$name = array();

			if (Locale::isLocaleValid($locale) && in_array($locale, $this->availableLocales)) {

103

			foreach ($this->getData($name) as $locale) {

				array_push($supportedLocales, $locale);

104

				if (Locale::isLocaleValid($locale) && in_array($locale, $this->availableLocales)) {

105

					array_push($$name, $locale);

106

100

107

101

108

102

109

103

		$primaryLocale = $this->getData('primaryLocale');

110

		$primaryLocale = $this->getData('primaryLocale');

104

111

105

		if ($primaryLocale != null && !empty($primaryLocale) && !in_array($primaryLocale, $supportedLocales)) {

112

		// Make sure at least the primary locale is chosen as available

106

			array_push($supportedLocales, $primaryLocale);

113

		if ($primaryLocale != null && !empty($primaryLocale)) {

114

			foreach (array('supportedLocales', 'supportedFormLocales') as $name) {

115

				if (!in_array($primaryLocale, $$name)) {

116

					array_push($$name, $primaryLocale);

117

118

107

119

108

		$this->setData('supportedLocales', $supportedLocales);

120

		$this->setData('supportedLocales', $supportedLocales);

121

		$this->setData('supportedFormLocales', $supportedFormLocales);

109

122

110

		foreach ($this->_data as $name => $value) {

123

		foreach ($this->_data as $name => $value) {

111

			if (!in_array($name, array_keys($this->settings))) continue;

124

			if (!in_array($name, array_keys($this->settings))) continue;

Lines 121-127	Link Here

121

		$conference->setPrimaryLocale($this->getData('primaryLocale'));

134

		$conference->setPrimaryLocale($this->getData('primaryLocale'));

122

		$conferenceDao->updateConference($conference);

135

		$conferenceDao->updateConference($conference);

123

136

124

125

137

126

138

127

?>

139

?>

(-)locale/en_US/manager.xml (+2 lines)

Lines 33-38	Link Here

	<message key="manager.groups.enableBoard.description"><![CDATA[For the <a href="{$aboutOrganizingTeamUrl}">Organizing Team</a> in About the Conference:]]></message>

	<message key="manager.groups.enableBoard.description"><![CDATA[For the <a href="{$aboutOrganizingTeamUrl}">Organizing Team</a> in About the Conference:]]></message>

	<message key="manager.groups.noneCreated">No organizing team positions have been created.</message>

	<message key="manager.groups.noneCreated">No organizing team positions have been created.</message>

	<message key="manager.importExport.noPlugins">There are no import/export plugins currently installed.</message>

	<message key="manager.importExport.noPlugins">There are no import/export plugins currently installed.</message>

 	<message key="manager.language.ui">UI</message>

 	<message key="manager.language.forms">Forms</message>

	<message key="manager.languages.languageInstructions"><![CDATA[OCS can be made available to users in any of several supported languages. As well, OCS can operate as a partially multilingual system, providing users with an ability to toggle between languages on each page, and allowing certain data to be entered in several additional languages.<br /><br/>If a language supported by OCS is not listed below, ask your site administrator to install the language from the site administration interface. For instructions on adding support for new languages, please consult the OCS documentation.]]></message>

	<message key="manager.languages.languageInstructions"><![CDATA[OCS can be made available to users in any of several supported languages. As well, OCS can operate as a partially multilingual system, providing users with an ability to toggle between languages on each page, and allowing certain data to be entered in several additional languages.<br /><br/>If a language supported by OCS is not listed below, ask your site administrator to install the language from the site administration interface. For instructions on adding support for new languages, please consult the OCS documentation.]]></message>

	<message key="manager.languages.noneAvailable">Sorry, no additional languages are available. Contact your site administrator if you wish to use additional languages with this conference.</message>

	<message key="manager.languages.noneAvailable">Sorry, no additional languages are available. Contact your site administrator if you wish to use additional languages with this conference.</message>

	<message key="manager.languages.primaryLocaleInstructions">This will be the default language for the conference site.</message>

	<message key="manager.languages.primaryLocaleInstructions">This will be the default language for the conference site.</message>




 *
 * Form to edit conference language settings.
 *
 * $Id: languageSettings.tpl,v 1.26 2009/07/03 00:11:18 asmecher Exp $
 *}
{strip}
{assign var="pageTitle" value="common.languages"}


<table class="data" width="100%">
<tr valign="top">
	<td width="20%" rowspan="2" class="label">{fieldLabel name="primaryLocale" required="true" key="locale.primary"}</td>
	<td width="80%" colspan="2" class="value">
		<select id="primaryLocale" name="primaryLocale" size="1" class="selectMenu">
			{html_options options=$availableLocales selected=$primaryLocale}
		</select>
	</td>
</tr>
<tr valign="top">
	<td>&nbsp;</td>
	<td colspan="2" class="value"><span class="instruct">{translate key="manager.languages.primaryLocaleInstructions"}</span></td>
</tr>
<tr valign="top">
	<td class="label" rowspan="2">{fieldLabel suppressId="true" name="supportedLocales" key="locale.supported"}</td>
	<td colspan="2" class="value">
		<table class="data" width="100%">
		<tr valign="top">
			<td width="20%">&nbsp;</td>
			<td align="center" width="10%">{translate key="manager.language.ui"}</td>
			<td align="center" width="10%">{translate key="manager.language.forms"}</td>
		</tr>
		{foreach from=$availableLocales key=localeKey item=localeName}
			<tr>
				<td>{$localeName|escape}</td>
				<td align="center"><input type="checkbox" name="supportedLocales[]" value="{$localeKey|escape}"{if in_array($localeKey, $supportedLocales)} checked="checked"{/if}/></td>
				<td align="center"><input type="checkbox" name="supportedFormLocales[]" value="{$localeKey|escape}"{if in_array($localeKey, $supportedFormLocales)} checked="checked"{/if}/></td>
			</tr>
		{/foreach}
		</table>
	</td>
</tr>
<tr valign="top">
	<td>&nbsp;</td>
	<td colspan="2" class="value"><span class="instruct">{translate key="manager.languages.supportedLocalesInstructions"}</span></td>
</tr>
</table>

Return to bug 3865