silverstripe / silverstripe-translatable

code/model/Translatable.php

Doc Comments +3 added lines, -6 removed lines

@@ -284,7 +284,7 @@ 
 	 * any database records (like pages), as this locale will be attached
 	 * to all new records.
 	 * 
-	 * @param $locale String
+	 * @param string $locale String
 	 */
 	static function set_default_locale($locale) {
 		if($locale && !i18n::validate_locale($locale)) {
@@ -318,7 +318,6 @@ 
 	 * to "auto-filter" all SELECT queries by this language.
 	 * See {@link disable_locale_filter()} on how to override this behaviour temporarily.
 	 * 
-	 * @param string $lang New reading language.
 	 */
 	static function set_current_locale($locale) {
 		if($locale && !i18n::validate_locale($locale)) {
@@ -363,8 +362,6 @@ 
 	 * @param string $join A single join clause.  This can be used for filtering, only 1 
 	 *               instance of each DataObject will be returned.
 	 * @param string $limit A limit expression to be inserted into the LIMIT clause.
-	 * @param string $containerClass The container class to return the results in.
-	 * @param string $having A filter to be inserted into the HAVING clause.
 	 * @return mixed The objects matching the conditions.
 	 */
 	static function get_by_locale($class, $locale, $filter = '', $sort = '', $join = "", $limit = "") {
@@ -601,7 +598,7 @@ 
 	 * Check if a given SQLQuery filters on the Locale field
 	 *
 	 * @param SQLQuery $query
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	protected function filtersOnLocale($query) {
 		foreach($query->getWhere() as $condition) {
@@ -1527,7 +1524,7 @@ 
 	}
 	
 	/**
-	 * @return boolean
+	 * @return null|false
 	 */
 	function canEdit($member) {
 		if(!$this->owner->Locale) return null;