日本語URL対応とインストール画面の日本語化

concrete54japan · Sep 1, 2011 · 41bd7a1 · 41bd7a1
1 parent 9f98199
commit 41bd7a1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/web/concrete/libraries/request.php b/web/concrete/libraries/request.php
@@ -284,7 +284,7 @@ public function getRequestCollectionPath() {
 		// I think the regexps take care of the trimming for us but just to be sure..
 		$cPath = trim($this->cPath, '/');
 		if ($cPath != '') {
-			return '/' . $cPath;
+			return '/' . rawurldecode($cPath);
 		}
 		return '';
 	}

diff --git a/web/concrete/models/page.php b/web/concrete/models/page.php
@@ -658,7 +658,7 @@ function getAllowedSubCollections() {
 	 * @return string
 	 */	
 	function getCollectionPath() {
-		return $this->cPath;
+		return $this->getEncodePath($this->cPath);
 	}
 
 	/**
@@ -678,7 +678,19 @@ public static function getCollectionPathFromID($cID) {
 		$path .= '/';
 
 		Cache::set('page_path', $cID, $path);
-		return $path;
+		return $this->getEncodePath($path);
+	}
+
+	function getEncodePath($path){
+	    if(mb_strpos($path,"/") !== false){
+	      $path = explode("/",$path);
+	      $path = array_map("rawurlencode",$path);
+	      return implode("/",$path);
+	    }else if(is_null($path)){
+          return NULL;
+	    }else{
+	      return urlencode($path);
+	    }	
 	}
 
 	/**

diff --git a/web/concrete/startup/config_check_complete.php b/web/concrete/startup/config_check_complete.php
@@ -2,6 +2,11 @@
 defined('C5_EXECUTE') or die("Access Denied.");
 if ($config_check_failed) {
 	define('ENABLE_LEGACY_CONTROLLER_URLS', true);
+    define("LOCALE","ja_JP.UTF8");
+	## Localization ##	
+	require(dirname(__FILE__) . '/../config/localization.php');
+
+
 	// nothing is installed
 	$v = View::getInstance();
 	$v->render('/install/');