In-Portal Issue Tracker

Index: multilanguage_helper.php
===================================================================
--- multilanguage_helper.php	(revision 15327)
+++ multilanguage_helper.php	(working copy)
@@ -406,4 +406,51 @@
 			}
 			return preg_replace('/, $/', ';', $ret);
 		}
+
+		/**
+		 * Returns phrase based on given number
+		 *
+		 * @param int $number
+		 * @param Array $forms
+		 * @param bool $allow_editing
+		 * @param bool $use_admin
+		 * @return string
+		 * @access public
+		 */
+		public function getPluralPhrase($number, $forms, $allow_editing = true, $use_admin = false)
+		{
+			// normalize given forms
+			if ( !array_key_exists('phrase5', $forms) ) {
+				$forms['phrase5'] = $forms['phrase2'];
+			}
+
+			$phrase_type = $this->getPluralPhraseType($number);
+
+			return $this->Application->Phrase($forms['phrase' . $phrase_type], $allow_editing, $use_admin);
+		}
+
+		/**
+		 * Returns phrase type based on given number
+		 *
+		 * @param int $number
+		 * @return int
+		 * @access protected
+		 */
+		protected function getPluralPhraseType($number)
+		{
+			$last_digit = substr($number, -1);
+			$last_but_one_digit = strlen($number) > 1 ? substr($number, -2, 1) : false;
+			$phrase_type = '5';
+
+			if ( $last_but_one_digit != 1 ) {
+				if ( $last_digit == 1 ) {
+					$phrase_type = '1';
+				}
+				elseif ( $last_digit >= 2 && $last_digit <= 4 ) {
+					$phrase_type = '2';
+				}
+			}
+
+			return $phrase_type;
+		}
 	}
Index: page_helper.php
===================================================================
--- page_helper.php	(revision 15165)
+++ page_helper.php	(working copy)
@@ -89,7 +89,10 @@
 			$current_revision_info['saved'] = sprintf($phrase, $current_revision->GetField('AutoSavedOn_time') . ' (' . $this->getAgoTime($autosave_time) . ')');
 		}
 
-		$currently_editing = $this->getPluralPhrase(
+		$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
+		/* @var $ml_helper kMultiLanguageHelper */
+
+		$currently_editing = $ml_helper->getPluralPhrase(
 			count($users),
 			Array (
 				'phrase1' => 'la_PageCurrentlyEditing1',
@@ -269,47 +272,4 @@
 
 		return $content_block->isLoaded();
 	}
-
-	/**
-	 * Returns phrase based on given number
-	 *
-	 * @param int $number
-	 * @param Array $forms
-	 * @return string
-	 */
-	function getPluralPhrase($number, $forms, $allow_editing = true, $use_admin = false)
-	{
-		// normalize given forms
-		if ( !array_key_exists('phrase5', $forms) ) {
-			$forms['phrase5'] = $forms['phrase2'];
-		}
-
-		$phrase_type = $this->getPluralPhraseType($number);
-
-		return $this->Application->Phrase( $forms['phrase' . $phrase_type], $allow_editing, $use_admin );
-	}
-
-	/**
-	 * Returns phrase type based on given number
-	 *
-	 * @param int $number
-	 * @return int
-	 */
-	function getPluralPhraseType($number)
-	{
-		$last_digit = substr($number, -1);
-		$last_but_one_digit = strlen($number) > 1 ? substr($number, -2, 1) : false;
-		$phrase_type = '5';
-
-		if ($last_but_one_digit != 1) {
-			if ($last_digit == 1) {
-				$phrase_type = '1';
-			}
-			elseif ($last_digit >= 2 && $last_digit <= 4) {
-				$phrase_type = '2';
-			}
-		}
-
-		return $phrase_type;
-	}
 }