Add missing translatable strings to achieve fully internationalized i…

…nterface
concrete5japan · Oct 1, 2012 · a6ea8e8 · a6ea8e8
1 parent 2e48a84
commit a6ea8e8
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 45 deletions.
diff --git a/web/concrete/core/models/attribute/key.php b/web/concrete/core/models/attribute/key.php
@@ -9,7 +9,7 @@ public function getSearchIndexFieldDefinition() {
 	/** 
 	 * Returns the name for this attribute key
 	 */
-	public function getAttributeKeyName() { return $this->akName;}
+	public function getAttributeKeyName() { return t($this->akName);}
 
 	/** 
 	 * Returns the handle for this attribute key

diff --git a/web/concrete/core/models/attribute/set.php b/web/concrete/core/models/attribute/set.php
@@ -35,7 +35,7 @@ public static function getListByPackage($pkg) {
 
 	public function getAttributeSetID() {return $this->asID;}
 	public function getAttributeSetHandle() {return $this->asHandle;}
-	public function getAttributeSetName() {return $this->asName;}
+	public function getAttributeSetName() {return t($this->asName);}
 	public function getPackageID() {return $this->pkgID;}
 	public function getPackageHandle() {return PackageList::getHandle($this->pkgID);}
 	public function getAttributeSetKeyCategoryID() {return $this->akCategoryID;}

diff --git a/web/concrete/core/models/attribute/type.php b/web/concrete/core/models/attribute/type.php
@@ -4,7 +4,7 @@ class Concrete5_Model_AttributeType extends Object {
 
 	public function getAttributeTypeID() {return $this->atID;}
 	public function getAttributeTypeHandle() {return $this->atHandle;}
-	public function getAttributeTypeName() {return $this->atName;}
+	public function getAttributeTypeName() {return t($this->atName);}
 	public function getController() {return $this->controller;}
 
 	public static function getByID($atID) {
@@ -258,4 +258,4 @@ public function install() {
 		$at = parent::add($this->atHandle, $this->atName);
 	}
 
-}
+}
diff --git a/web/concrete/core/models/block.php b/web/concrete/core/models/block.php
@@ -674,7 +674,7 @@ function getBlockCollectionID() {
 	}
 
 	function getBlockTypeName() {
-		return $this->btName;
+		return t($this->btName);
 	}
 
 	function getBlockTypeHandle() {
@@ -733,7 +733,7 @@ function getBlockUserID() {
 	}
 
 	function getBlockName() {
-		return $this->bName;
+		return t($this->bName);
 	}
 
 	/**

diff --git a/web/concrete/core/models/block_types.php b/web/concrete/core/models/block_types.php
@@ -468,7 +468,7 @@ public function canUnInstall() {
 		 * @return string
 		 */
 		function getBlockTypeDescription() {
-			return $this->btDescription;
+			return t($this->btDescription);
 		}
 
 		/**
@@ -985,7 +985,7 @@ function getBlockAddAction(&$a, $alternateHandler = null) {
 
 
 		function getBlockTypeName() {
-			return $this->btName;
+			return t($this->btName);
 		}
 
 		function isInstalled() {
@@ -1017,4 +1017,3 @@ function hasCustomAddTemplate() {
 		}
 
 	}
-
diff --git a/web/concrete/core/models/collection_types.php b/web/concrete/core/models/collection_types.php
@@ -582,7 +582,7 @@ public function getCollectionTypeIconImage() {
 
 
 		public function getCollectionTypeID() { return $this->ctID; }
-		public function getCollectionTypeName() { return $this->ctName; }
+		public function getCollectionTypeName() { return t($this->ctName); }
 		public function getCollectionTypeHandle() { return $this->ctHandle; }
 		public function isCollectionTypeIncludedInComposer() {return $this->ctIncludeInComposer;}
 		public function isCollectionTypeInternal() {return $this->ctIsInternal;}
@@ -602,4 +602,4 @@ public function getPackageHandle() {
 			return PackageList::getHandle($this->pkgID);
 		}
 
-	}
+	}
diff --git a/web/concrete/core/models/collection_version.php b/web/concrete/core/models/collection_version.php
@@ -114,7 +114,7 @@ function isMostRecent() {return $this->cvIsMostRecent;}
 		function isNew() {return $this->cvIsNew;}
 		function getVersionID() {return $this->cvID;}
 		function getCollectionID() {return $this->cID;}
-		function getVersionName() {return $this->cvName;}	
+		function getVersionName() {return t($this->cvName);}
 		function getVersionComments() {return $this->cvComments;}
 		function getVersionAuthorUserID() {return $this->cvAuthorUID;}
 		function getVersionApproverUserID() {return $this->cvApproverUID;}
@@ -400,4 +400,4 @@ function getVersionListCount() {
 
 	}
 
-?>
+?>
diff --git a/web/concrete/core/models/file_set.php b/web/concrete/core/models/file_set.php
@@ -150,7 +150,7 @@ public function getFileSetID() {
 		}
 		public function overrideGlobalPermissions() {return $this->fsOverrideGlobalPermissions;}
 
-		public function getFileSetName() {return $this->fsName;}	
+		public function getFileSetName() {return t($this->fsName);}
 
 		/**
 		 * Creats a new fileset if set doesn't exists
@@ -344,4 +344,3 @@ public static function add($name, $searchRequest, $searchColumnsObject) {
 
 	}
 
-
diff --git a/web/concrete/core/models/file_storage_location.php b/web/concrete/core/models/file_storage_location.php
@@ -38,6 +38,6 @@ public function getByID($id) {
 	}
 
 	public function getID() {return $this->fslID;}
-	public function getName() {return $this->fslName;}
+	public function getName() {return t($this->fslName);}
 	public function getDirectory() {return $this->fslDirectory;}
 }
diff --git a/web/concrete/core/models/file_version.php b/web/concrete/core/models/file_version.php
@@ -18,7 +18,7 @@ public function getPrefix() {return $this->fvPrefix;}
 	public function getFileName() {return $this->fvFilename;}
 	public function getTitle() {return $this->fvTitle;}
 	public function getTags() {return $this->fvTags;}
-	public function getDescription() {return $this->fvDescription;}
+	public function getDescription() {return t($this->fvDescription);}
 	public function isApproved() {return $this->fvIsApproved;}
 
 	public function getGenericTypeText() {
@@ -581,4 +581,4 @@ public static function cleanTags($tagsStr){
 		//the leading and trailing line break char is for searching: fvTag like %\ntag\n%
 		return "\n".join("\n",$cleanTags)."\n";
 	}
-}
+}
diff --git a/web/concrete/core/models/group_set.php b/web/concrete/core/models/group_set.php
@@ -44,7 +44,7 @@ public static function getListByPackage($pkg) {
 	}
 
 	public function getGroupSetID() {return $this->gsID;}
-	public function getGroupSetName() {return $this->gsName;}
+	public function getGroupSetName() {return t($this->gsName);}
 	public function getPackageID() {return $this->pkgID;}
 
 	public function updateGroupSetName($gsName) {
@@ -108,4 +108,4 @@ public function removeGroup(Group $g) {
 		$db->Execute('delete from GroupSetGroups where gsID = ? and gID = ?', array($this->getGroupSetID(), $g->getGroupID()));
 	}
 
-}
+}
diff --git a/web/concrete/core/models/groups.php b/web/concrete/core/models/groups.php
@@ -199,11 +199,11 @@ function getGroupID() {
 		}
 
 		function getGroupName() {
-			return $this->gName;
+			return t($this->gName);
 		}
 
 		function getGroupDescription() {
-			return $this->gDescription;
+			return t($this->gDescription);
 		}
 
 		/**
@@ -309,4 +309,4 @@ public function setGroupExpirationByInterval($days, $hours, $minutes, $action) {
 
 	}
 
-?>
+?>
diff --git a/web/concrete/core/models/job.php b/web/concrete/core/models/job.php
@@ -34,8 +34,8 @@ function run(){
 		throw new Exception(t('Error: The Job::run() method must be overridden by your child Job class.'));
 	}	
 
-	public function getJobName() {return $this->jName;}
-	public function getJobDescription() {return $this->jDescription;}	
+	public function getJobName() {return t($this->jName);}
+	public function getJobDescription() {return t($this->jDescription);}
 	public function getJobHandle() {return $this->jHandle;}
 	public function getPackageHandle() {
 		return PackageList::getHandle($this->pkgID);
@@ -342,4 +342,4 @@ public static function clearLog() {
 
 }
 
-?>
+?>
diff --git a/web/concrete/core/models/layout_preset.php b/web/concrete/core/models/layout_preset.php
@@ -16,7 +16,7 @@ class Concrete5_Model_LayoutPreset extends Object{
 	protected $layoutID=0;
 
 	public function getLayoutPresetID(){ return $this->lpID; }
-	public function getLayoutPresetName(){ return $this->lpName; }
+	public function getLayoutPresetName(){ return t($this->lpName); }
 	public function getLayoutID(){ return $this->layoutID; }
 	public function getLayoutObject() { return Layout::getById($this->layoutID); }	 
 
@@ -53,4 +53,4 @@ public function add($lpName, $layout) {
 		$db = Loader::db();
 		$db->Execute('insert into LayoutPresets (lpName, layoutID) values (?, ?)', array( $lpName, $layout->getLayoutID() )  ); 
 	} 
-}
+}
diff --git a/web/concrete/core/models/page_theme.php b/web/concrete/core/models/page_theme.php
@@ -631,13 +631,13 @@ protected function install($dir, $ptHandle, $pkgID) {
 	}
 
 	public function getThemeID() {return $this->ptID;}
-	public function getThemeName() {return $this->ptName;}
+	public function getThemeName() {return t($this->ptName);}
 	public function getPackageID() {return $this->pkgID;}
 	public function getPackageHandle() {
 		return PackageList::getHandle($this->pkgID);
 	}
 	public function getThemeHandle() {return $this->ptHandle;}
-	public function getThemeDescription() {return $this->ptDescription;}
+	public function getThemeDescription() {return t($this->ptDescription);}
 	public function getThemeDirectory() {return $this->ptDirectory;}
 	public function getThemeURL() {return $this->ptURL;}
 	public function getThemeEditorCSS() {return $this->ptURL . '/' . PageTheme::FILENAME_TYPOGRAPHY_CSS;}

diff --git a/web/concrete/core/models/permission/access/entity/model.php b/web/concrete/core/models/permission/access/entity/model.php
@@ -8,7 +8,7 @@ public function getAccessEntityTypeObject() {
 	}
 	public function getAccessEntityTypeHandle() {return $this->petHandle;}
 	public function getAccessEntityID() {return $this->peID;}
-	public function getAccessEntityLabel() {return $this->label;}
+	public function getAccessEntityLabel() {return t($this->label);}
 	abstract public function getAccessEntityUsers(PermissionAccess $pa);
 	abstract public function getAccessEntityTypeLinkHTML();
 	abstract public static function getAccessEntitiesForUser($user);

diff --git a/web/concrete/core/models/permission/access/entity/type.php b/web/concrete/core/models/permission/access/entity/type.php
@@ -4,7 +4,7 @@ class Concrete5_Model_PermissionAccessEntityType extends Object {
 
 	public function getAccessEntityTypeID() {return $this->petID;}
 	public function getAccessEntityTypeHandle() {return $this->petHandle;}
-	public function getAccessEntityTypeName() {return $this->petName;}
+	public function getAccessEntityTypeName() {return t($this->petName);}
 	public function getAccessEntityTypeClass() {
 		$class = Loader::helper('text')->camelcase($this->petHandle) . 'PermissionAccessEntity';
 		return $class;

diff --git a/web/concrete/core/models/permission/key.php b/web/concrete/core/models/permission/key.php
@@ -27,7 +27,7 @@ public function permissionKeyHasCustomClass() {return $this->pkHasCustomClass;}
 	/** 
 	 * Returns the name for this permission key
 	 */
-	public function getPermissionKeyName() { return $this->pkName;}
+	public function getPermissionKeyName() { return t($this->pkName);}
 
 	/** 
 	 * Returns the handle for this permission key
@@ -37,7 +37,7 @@ public function getPermissionKeyHandle() { return $this->pkHandle;}
 	/** 
 	 * Returns the description for this permission key
 	 */
-	public function getPermissionKeyDescription() { return $this->pkDescription;}
+	public function getPermissionKeyDescription() { return t($this->pkDescription);}
 
 	/** 
 	 * Returns the ID for this permission key

diff --git a/web/concrete/core/models/system/antispam/library.php b/web/concrete/core/models/system/antispam/library.php
@@ -3,7 +3,7 @@
 class Concrete5_Model_SystemAntispamLibrary extends Object {
 
 	public function getSystemAntispamLibraryHandle() { return $this->saslHandle;}
-	public function getSystemAntispamLibraryName() { return $this->saslName;}
+	public function getSystemAntispamLibraryName() { return t($this->saslName);}
 	public function isSystemAntispamLibraryActive() { return $this->saslIsActive;}
 	public function getPackageID() { return $this->pkgID;}
 	public function getPackageHandle() {
@@ -137,4 +137,4 @@ public function getController() {
 		return $cl;
 	}
 
-}
+}
diff --git a/web/concrete/core/models/system/captcha/library.php b/web/concrete/core/models/system/captcha/library.php
@@ -3,7 +3,7 @@
 class Concrete5_Model_SystemCaptchaLibrary extends Object {
 
 	public function getSystemCaptchaLibraryHandle() { return $this->sclHandle;}
-	public function getSystemCaptchaLibraryName() { return $this->sclName;}
+	public function getSystemCaptchaLibraryName() { return t($this->sclName);}
 	public function isSystemCaptchaLibraryActive() { return $this->sclIsActive;}
 	public function getPackageID() { return $this->pkgID;}
 	public function getPackageHandle() {
@@ -130,4 +130,4 @@ public function getController() {
 		return $cl;
 	}
 
-}
+}
diff --git a/web/concrete/core/models/system_notification.php b/web/concrete/core/models/system_notification.php
@@ -14,7 +14,7 @@ class Concrete5_Model_SystemNotification extends Object {
 	public function getSystemNotificationURL() {return $this->snURL;}
 	public function getSystemNotificationAlternateURL() {return $this->snURL2;}
 	public function getSystemNotificationTitle() {return $this->snTitle;}
-	public function getSystemNotificationDescription() {return $this->snDescription;}
+	public function getSystemNotificationDescription() {return t($this->snDescription);}
 	public function getSystemNotificationBody() {return $this->snBody;}
 	public function getSystemNotificationDateTime() {return $this->snDateTime;}
 	public function isSystemNotificationNew() {return $this->snIsNew;}
@@ -57,4 +57,4 @@ public static function getByID($snID) {
 		}
 	}
 
-}
+}
diff --git a/web/concrete/core/models/workflow/model.php b/web/concrete/core/models/workflow/model.php
@@ -16,7 +16,7 @@ abstract class Concrete5_Model_Workflow extends Object {
 	public function getAllowedTasks() {return $this->allowedTasks;}
 
 	public function getWorkflowID() {return $this->wfID;}
-	public function getWorkflowName() {return $this->wfName;}
+	public function getWorkflowName() {return t($this->wfName);}
 	public function getWorkflowTypeObject() {
 		return WorkflowType::getByID($this->wftID);
 	}
@@ -110,4 +110,4 @@ public function getPermissionAccessObject() {
 	public function validateTrigger(WorkflowRequest $req) {
 		return true;
 	}
-}
+}
diff --git a/web/concrete/core/models/workflow/progress/action.php b/web/concrete/core/models/workflow/progress/action.php
@@ -54,7 +54,7 @@ public function getWorkflowProgressActionStyleInnerButtonRightHTML() {
 		return $this->wrActionStyleInnerButtonRight;
 	}
 	public function getWorkflowProgressActionLabel() {
-		return $this->wrActionLabel;
+		return t($this->wrActionLabel);
 	}
 	public function getWorkflowProgressActionTask() {
 		return $this->wrActionTask;
@@ -80,4 +80,4 @@ public function __construct() {
 		$this->setWorkflowProgressActionTask('approve');
 	}
 
-}
+}
diff --git a/web/concrete/core/models/workflow/type.php b/web/concrete/core/models/workflow/type.php
@@ -4,7 +4,7 @@ class Concrete5_Model_WorkflowType extends Object {
 
 	public function getWorkflowTypeID() {return $this->wftID;}
 	public function getWorkflowTypeHandle() {return $this->wftHandle;}
-	public function getWorkflowTypeName() {return $this->wftName;}
+	public function getWorkflowTypeName() {return t($this->wftName);}
 
 	public static function getByID($wftID) {
 		$db = Loader::db();