summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2014-02-28 21:03:43 +0100
committerBart Visscher <bartv@thisnet.nl>2014-02-28 21:03:43 +0100
commit8951328a87c16e5ebfe4d3e5c392347db1e54f92 (patch)
tree5ab48360719a7ec9df21f8c4e42c6c7bc6f30bdc
parente2286c659860b107e0d2791a231eb7b4ab3dca98 (diff)
downloadnextcloud-server-8951328a87c16e5ebfe4d3e5c392347db1e54f92.tar.gz
nextcloud-server-8951328a87c16e5ebfe4d3e5c392347db1e54f92.zip
More PHPDoc updates
-rw-r--r--lib/private/l10n.php9
-rw-r--r--lib/private/server.php2
-rw-r--r--lib/public/il10n.php2
-rw-r--r--lib/public/iservercontainer.php2
-rw-r--r--settings/admin/controller.php4
5 files changed, 10 insertions, 9 deletions
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index b98ccc9d58b..f0b4f9a70f6 100644
--- 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 7696fc207fd..3255713e12a 100644
--- 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 276e5d6a554..1388274c21a 100644
--- 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 5fb51f9ecd5..0eb358816d2 100644
--- 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 a075d774361..1a73c8fad3f 100644
--- 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) {