Add support for PHP7 random_bytes in favor of mcrypt_create_iv

[lhc/web/wiklou.git] / languages / classes / LanguageHe.php

diff --git a/languages/classes/LanguageHe.php b/languages/classes/LanguageHe.php
index 22be1de..a6aaf6d 100644 (file)
--- a/languages/classes/LanguageHe.php
+++ b/languages/classes/LanguageHe.php
@@ -35,8 +35,8 @@ class LanguageHe extends Language {
         * Available cases:
         * "prefixed" (or "תחילית") - when the word has a prefix
         *
-        * @param $word String: the word to convert
-        * @param $case String: the case
+        * @param string $word The word to convert
+        * @param string $case The case
         *
         * @return string
         */
@@ -49,17 +49,17 @@ class LanguageHe extends Language {
                switch ( $case ) {
                        case 'prefixed':
                        case 'תחילית':
-                               # Duplicate the "Waw" if prefixed
-                               if ( substr( $word, 0, 2 ) == "ו" && substr( $word, 0, 4 ) != "וו" ) {
+                               # Duplicate the "Waw" if prefixed, but not if it is already double.
+                               if ( substr( $word, 0, 2 ) === "ו" && substr( $word, 0, 4 ) !== "וו" ) {
                                        $word = "ו" . $word;
                                }
 
-                               # Remove the "He" if prefixed
-                               if ( substr( $word, 0, 2 ) == "ה" ) {
+                               # Remove the "He" article if prefixed.
+                               if ( substr( $word, 0, 2 ) === "ה" ) {
                                        $word = substr( $word, 2 );
                                }
 
-                               # Add a hyphen (maqaf) if non-Hebrew letters
+                               # Add a hyphen (maqaf) before non-Hebrew letters.
                                if ( substr( $word, 0, 2 ) < "א" || substr( $word, 0, 2 ) > "ת" ) {
                                        $word = "־" . $word;
                                }
@@ -67,24 +67,4 @@ class LanguageHe extends Language {
 
                return $word;
        }
-
-       /**
-        * Gets a number and uses the suited form of the word.
-        *
-        * @param $count Integer: the number of items
-        * @param $forms Array with 3 items: the three plural forms
-        * @return String: the suited form of word
-        */
-       function convertPlural( $count, $forms ) {
-               if ( !count( $forms ) ) { return ''; }
-               $forms = $this->preConvertPlural( $forms, 3 );
-
-               if ( $count == 1 ) {
-                       return $forms[0]; // Singular
-               } elseif ( $count == 2 ) {
-                       return $forms[2]; // Dual or plural if dual is not provided (filled in preConvertPlural)
-               } else {
-                       return $forms[1]; // Plural
-               }
-       }
 }