More PHPDoc updates

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index b98ccc9d58bdc450aad57f16296a6fb3e983dcc9..f0b4f9a70f6040a9cc1c9bed70b58aa61a9a1392 100644 (file)
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -351,7 +351,7 @@ class OC_L10N implements \OCP\IL10N {
        /**
         * @brief Localization
         * @param string $type Type of localization
-        * @param array $params parameters for this localization
+        * @param array $data parameters for this localization
         * @returns String or false
         *
         * Returns the localized data.
@@ -413,9 +413,9 @@ class OC_L10N implements \OCP\IL10N {
         * This function is useful to avoid loading thousands of files if only one
         * simple string is needed, for example in appinfo.php
         */
-       public static function selectLanguage($text) {
-               $lang = self::findLanguage(array_keys($text));
-               return $text[$lang];
+       public static function selectLanguage($texts) {
+               $lang = self::findLanguage(array_keys($texts));
+               return $texts[$lang];
        }
 
        /**
@@ -533,6 +533,7 @@ class OC_L10N implements \OCP\IL10N {
 
        /**
         * @param string $lang
+        * @param string $app
         */
        public static function languageExists($app, $lang) {
                if ($lang == 'en') {//english is always available

diff --git a/lib/private/server.php b/lib/private/server.php
index 7696fc207fdc6af15884dcccaf8971ccb83fba21..3255713e12aeb58490f3560903e34d6b89941772 100644 (file)
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -290,7 +290,7 @@ class Server extends SimpleContainer implements IServerContainer {
 
        /**
         * get an L10N instance
-        * @param $app string appid
+        * @param string $app appid
         * @return \OC_L10N
         */
        function getL10N($app) {

diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index 276e5d6a5541f872500e3ed0d5acdff09242224d..1388274c21af4cd2e15379b2e1edafad2293ccf0 100644 (file)
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -52,7 +52,7 @@ interface IL10N {
        /**
         * Localization
         * @param string $type Type of localization
-        * @param array $params parameters for this localization
+        * @param array $data parameters for this localization
         * @return String or false
         *
         * Returns the localized data.

diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 5fb51f9ecd53f1cba87bbea0e4ad3e047fe767c6..0eb358816d23fc8d9dd0d902f74d02d44dee5673 100644 (file)
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -122,7 +122,7 @@ interface IServerContainer {
 
        /**
         * get an L10N instance
-        * @param $app string appid
+        * @param string $app appid
         * @return \OCP\IL10N
         */
        function getL10N($app);

diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index a075d7743616c1df2e08ed1993b63f9a468f280b..1a73c8fad3fc2cf66707d1626a238960bd90b46a 100644 (file)
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -76,8 +76,8 @@ class Controller {
        /**
         * Get the field name to use it in error messages
         *
-        * @param $setting string
-        * @param $l \OC_L10N
+        * @param string $setting
+        * @param \OC_L10N $l
         * @return string
         */
        public static function getFieldname($setting, $l) {