aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-07 12:38:36 -0800
committerLukas Reschke <lukas@statuscode.ch>2013-02-07 12:38:36 -0800
commitc0154558c7b29bbd55b099f9fcab8ed6c0b108ef (patch)
tree0e6e983c4e735869373ce6af439dc10783d0f57d /core
parentfc7230349b6028184b21b229ef5873ea8b7aa99a (diff)
parent5f92d269dc83762bbf200158149eec1e605c98a6 (diff)
downloadnextcloud-server-c0154558c7b29bbd55b099f9fcab8ed6c0b108ef.tar.gz
nextcloud-server-c0154558c7b29bbd55b099f9fcab8ed6c0b108ef.zip
Merge pull request #1526 from owncloud/l10n-support-master
L10n support master
Diffstat (limited to 'core')
-rw-r--r--core/ajax/vcategories/add.php2
-rw-r--r--core/ajax/vcategories/removeFromFavorites.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index 23d00af70ab..16a1461be08 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -34,7 +34,7 @@ debug(print_r($category, true));
$categories = new OC_VCategories($type);
if($categories->hasCategory($category)) {
- bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category));
+ bailOut($l->t('This category already exists: %s', array($category)));
} else {
$categories->add($category, true);
}
diff --git a/core/ajax/vcategories/removeFromFavorites.php b/core/ajax/vcategories/removeFromFavorites.php
index ba6e95c2497..78a528caa86 100644
--- a/core/ajax/vcategories/removeFromFavorites.php
+++ b/core/ajax/vcategories/removeFromFavorites.php
@@ -27,12 +27,12 @@ if(is_null($type)) {
}
if(is_null($id)) {
- bailOut($l->t('%s ID not provided.', $type));
+ bailOut($l->t('%s ID not provided.', array($type)));
}
$categories = new OC_VCategories($type);
if(!$categories->removeFromFavorites($id, $type)) {
- bailOut($l->t('Error removing %s from favorites.', $id));
+ bailOut($l->t('Error removing %s from favorites.', array($id)));
}
OC_JSON::success();