moving content i18n into separate free package

web/concrete/config/localization.php

@@ -2,12 +2,13 @@
 defined('C5_EXECUTE') or die("Access Denied."); 
 
 $u = new User();
+Config::getOrDefine('SITE_LOCALE', 'en_US');
+
 if ($u->getUserDefaultLanguage() != '') {
 	define('ACTIVE_LOCALE', $u->getUserDefaultLanguage());
 } else if (defined('LOCALE')) {
 	define('ACTIVE_LOCALE', LOCALE);
 } else {
-	Config::getOrDefine('SITE_LOCALE', 'en_US');
 	define('ACTIVE_LOCALE', SITE_LOCALE);
 }
 
@@ -22,9 +23,6 @@
 	define("LANGUAGE", ACTIVE_LOCALE);
 }
 
-define('LANGUAGE_CONTENT_LANGUAGES_AVAILABLE', 'ar,cs,da,de,es,fi,fr,hu,id,it,ja,nl,pt_BR,pt_PT,ro,ru,sv');
-
-
 // initialize localization immediately following defining locale
 Localization::init();
 

web/concrete/controllers/dashboard/settings/multilingual/controller.php

@@ -22,127 +22,14 @@ public function view() {
 		$this->set('LANGUAGE_MULTILINGUAL_CONTENT_ENABLED', Config::get('LANGUAGE_MULTILINGUAL_CONTENT_ENABLED'));
 		$this->set('interfacelocales', $locales);
 		$this->set('languages', $languages);
-
-		// get all locales for multilingual content
-		if (Config::get('LANGUAGE_MULTILINGUAL_CONTENT_ENABLED')) {
-			$locales = array();
-			$languages = Localization::getAvailableContentLanguages();
-			array_unshift($languages, 'en');
-			$countries = Zend_Locale::getTranslationList('territory', ACTIVE_LOCALE);
-			$locales[''] = t('** Choose a Language');
-			foreach($languages as $lang) {
-				$loc = new Zend_Locale($lang);
-				$language = Zend_Locale::getTranslation($loc->getLanguage(), 'language', ACTIVE_LOCALE);
-				$locales[$lang] = $language;
-				if ($loc->getRegion() != '') {
-					$locales[$lang] .= ' (' . $countries[$loc->getRegion()] . ')';
-				}
-			}
-
-			$this->set('pages', LanguageSectionPage::getList());			
-			$this->set('locales', $locales);
-		}
 	}
 
-	public function load_icons() {
-		if (!$this->post('lsLanguage')) {
-			return false;
-		}
-		$ch = Loader::helper('concrete/interface');
-		Loader::library('3rdparty/Zend/Locale');
-		// here's what we do. We load all locales, then we filter through all those that match the posted language code
-		// and we return html for all regions in that language
-		$locales = Zend_Locale::getLocaleList();
-		$countries = array();
-		$html = '<ul class="ccm-multilingual-choose-flag">';
-
-		foreach($locales as $locale => $none) {
-			$zl = new Zend_Locale($locale);
-			if ($zl->getLanguage() == $this->post('lsLanguage') || $zl->toString() == $this->post('lsLanguage')) {
-				$countries[$zl->getRegion()] = Zend_Locale::getTranslation($zl->getRegion(), 'country', ACTIVE_LOCALE);
-			}
-		}
 
-		asort($countries);
-		$i = 1;
-		foreach($countries as $region => $value) {
-			$flag = $ch->getFlagIconSRC($region);
-			if ($flag) {
-				$checked = "";
-				if ($this->post('selectedLanguageIcon') == $region) {
-					$checked = "checked=\"checked\"";
-				} else if ($i == 1 && (!$this->post('selectedLanguageIcon'))) {
-					$checked = "checked=\"checked\"";
-				}
-
-				$html .= '<li><input type="radio" name="lsIcon" ' . $checked . ' id="languageIcon' . $i . '" value="' . $region . '" /><label for="languageIcon' . $i . '">' . $flag . ' ' . $value  . '</label></li>';
-				$i++;
-			}
-		}
-
-		$html .= '</ul>';
-		print $html;
-		exit;
-	}
-
+
 	public function interface_settings_saved() {
 		$this->set('message', t('Interface settings saved'));
 		$this->view();
 	}
-
-	public function multilingual_content_enabled() {
-		$this->set('message', t('Multilingual content enabled'));
-		$this->view();
-	}
-
-	public function multilingual_content_updated() {
-		$this->set('message', t('Multilingual content updated'));
-		$this->view();
-	}
-
-	public function add_content_section() {
-		if (Loader::helper('validation/token')->validate('add_content_section')) {
-			if ((!Loader::helper('validation/numbers')->integer($this->post('pageID'))) || $this->post('pageID') < 1) {
-				$this->error->add(t('You must specify a page for this multilingual content section.'));
-			} else {
-				$pc = Page::getByID($this->post('pageID'));
-				if ($pc->isError() || $pc->getCollectionParentID() != 1) {
-					$this->error->add(t('Invalid Page. You must specify a page directly under the home page.'));
-				}
-			}
-			if (!$this->post('lsIcon')) {
-				$this->error->add(t('You must choose an icon.'));
-			}
-
-			if (!$this->error->has()) {
-				$lc = LanguageSectionPage::getByID($this->post('pageID'));
-				if (is_object($lc)) {
-					$this->error->add(t('A language section page at this location already exists.'));
-				}
-			}
-			if (!$this->error->has()) {
-				LanguageSectionPage::assign($pc, $this->post('lsLanguage'), $this->post('lsIcon'));
-				$this->redirect('/dashboard/settings/multilingual', 'multilingual_content_updated');
-			}
-		} else {
-			$this->error->add(Loader::helper('validation/token')->getErrorMessage());
-		}
-		$this->view();
-	}
-
-	public function enable_multilingual_content() {
-		if (Loader::helper('validation/token')->validate('enable_multilingual_content')) {
-
-			Config::save('LANGUAGE_MULTILINGUAL_CONTENT_ENABLED', 1);
-			$this->redirect('/dashboard/settings/multilingual', 'multilingual_content_enabled');
-
-		} else {
-			$this->error->add(Loader::helper('validation/token')->getErrorMessage());
-		}
-		$this->view();
-	}
-
-
 	public function save_interface_language() {
 		if (Loader::helper('validation/token')->validate('save_interface_language')) {
 

web/concrete/dispatcher.php

@@ -70,7 +70,6 @@
 	Loader::model('page');
 	Loader::model('page_theme');
 	Loader::model('composer_page');
-	Loader::model('language_section_page');
 	Loader::model('permissions');
 	Loader::model('user');
 	Loader::model('userinfo');

web/concrete/models/page.php

@@ -526,14 +526,7 @@ public function getCollectionIcon() {
 			}
 
 		} else {
-			$obj = LanguageSectionPage::getByID($this->getCollectionID());
-			if (is_object($obj)) {
-				if (file_exists(DIR_FILES_LANGUAGE_ICONS . '/' . strtolower($obj->getIcon()) . '.png')) {
-					$icon = REL_DIR_FILES_LANGUAGE_ICONS . '/' . strtolower($obj->getIcon()) . '.png';
-				} else if (file_exists(DIR_FILES_LANGUAGE_ICONS_CORE . '/' . strtolower($obj->getIcon()) . '.png')) {
-					$icon = REL_DIR_FILES_LANGUAGE_ICONS_CORE . '/' . strtolower($obj->getIcon()) . '.png';
-				}
-			}			
+
 		}
 		return $icon;
 	}

web/concrete/single_pages/dashboard/settings/multilingual/view.php

@@ -30,89 +30,4 @@
 
 <? } ?>
 
-</div>
-
-
-<h1><span><?=t("Multilingual Content")?></span></h1>
-<div class="ccm-dashboard-inner">
-<? if ($LANGUAGE_MULTILINGUAL_CONTENT_ENABLED) { ?>
-
-<h2><?=t('Content Sections')?></h2>
-<? 
-$nav = Loader::helper('navigation');
-if (count($pages) > 0) { ?>
-	<table class="ccm-results-list" style="width: auto">
-	<thead>
-	<tr>
-		<th>&nbsp;</th>
-		<th style="width: 200px"><?=t("Name")?></td>
-		<th style="width: 200px"><?=t('Path')?></th>
-		<th>&nbsp;</th>
-	</tr>
-	<? foreach($pages as $pc) { ?>
-		<tr>
-			<td><img src="<?=$pc->getCollectionIcon()?>" /></td>
-			<td><a href="<?=$nav->getLinkToCollection($pc)?>"><?=$pc->getCollectionName()?></a></td>
-			<td><?=$pc->getCollectionPath()?></td>
-			<td><a href=""><img src="<?=ASSETS_URL_IMAGES?>/icons/remove_minus.png" /></td>
-		</tr>
-	<? } ?>
-	</table>
-	<br/><br/>
-<? } else { ?>
-	<p><?=t('You have not created any multilingual content sections yet.')?></p>
-<? } ?>
-<form method="post" action="<?=$this->action('add_content_section')?>">
-	<h2><?=t('Add a Language')?></h2>
-
-	<h3><?=$form->label('lsLanguage', t('Choose Language'))?></h3>
-	<div><?=$form->select('lsLanguage', $locales);?></div>
-
-	<br/>
-
-	<h3><?=t('Language Icon')?></h3>
-	<div id="ccm-multilingual-language-icon">
-	<?=t('Choose a Language')?>
-	</div>
-
-	<br/>
-	<h3><?=t('Choose a Parent Page')?></h3>
-	<?=Loader::helper('form/page_selector')->selectPage('pageID', '')?>
-	<br/>
-	<?=Loader::helper('validation/token')->output('add_content_section')?>
-	<?=Loader::helper('concrete/interface')->submit(t('Add Content Section'), 'add', 'left')?>
-</form>
-
-<style type="text/css">
-ul.ccm-multilingual-choose-flag {list-style-type: none;}
-
-</style>
-
-<script type="text/javascript">
-$(function() {
-	$("select[name=lsLanguage]").change(function() {
-		ccm_multilingualPopulateIcons($(this).val(), '');
-	});
-	ccm_multilingualPopulateIcons($("select[name=lsLanguage]").val(), '<?=$_POST["languageIcon"]?>');
-});
-
-ccm_multilingualPopulateIcons = function(lang, icon) {
-	if (lang != '') {
-		$("#ccm-multilingual-language-icon").load('<?=$this->action("load_icons")?>', {'lsLanguage': lang, 'selectedLanguageIcon': icon});
-	}
-}
-
-</script>
-
-<? } else { ?>
-
-<form method="post" action="<?=$this->action('enable_multilingual_content')?>">
-<p><?=t('Click below to enable multilingual content on your site. You will want to do this if you are building a site that contains content in multiple languages.')?></p>
-<div style="text-align: center">
-<br/>
-<?=Loader::helper('concrete/interface')->submit(t('Enable Multilingual Content'), 'enable', 'left')?>
-</div>
-	<?=Loader::helper('validation/token')->output('enable_multilingual_content')?>
-</form>
-<? } ?>
 </div>