10 files changed, 6 insertions, 12 deletions
diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php
index 6e7423cbe92..fa014351f77 100644
--- a/apps/calendar/ajax/calendar/new.form.php
+++ b/apps/calendar/ajax/calendar/new.form.php
@@ -7,7 +7,6 @@
  */
 
 require_once('../../../../lib/base.php');
-$l10n = new OC_L10N('calendar');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
index 2f73f5d0710..dd55f3e018f 100644
--- a/apps/calendar/ajax/calendar/overview.php
+++ b/apps/calendar/ajax/calendar/overview.php
@@ -7,7 +7,7 @@
  */
 
 require_once('../../../../lib/base.php');
-$l10n = new OC_L10N('calendar');
+$l10n = OC_L10N::get('calendar');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 $output = new OC_TEMPLATE("calendar", "part.choosecalendar");
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
index 862dec6bf5b..5fc12900ef3 100644
--- a/apps/calendar/ajax/event/delete.php
+++ b/apps/calendar/ajax/event/delete.php
@@ -7,8 +7,6 @@
  */
 require_once('../../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
index 59fda79da73..7070bbf05d7 100644
--- a/apps/calendar/ajax/event/new.php
+++ b/apps/calendar/ajax/event/new.php
@@ -8,8 +8,6 @@
 
 require_once('../../../../lib/base.php');
 
-$l10n = new OC_L10N('calendar');
-
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index c62f93c540e..d053df2e4c1 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -8,7 +8,7 @@
 
 require_once ('../../../lib/base.php');
 require_once('when/When.php');
-$l = new OC_L10N('calendar');
+$l = OC_L10N::get('calendar');
 $unnamed = $l->t('unnamed');
 function create_return_event($event, $vevent){
 	$return_event = array();
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
index 2e002092150..16ec54d14a2 100644
--- a/apps/calendar/ajax/import/dialog.php
+++ b/apps/calendar/ajax/import/dialog.php
@@ -9,7 +9,6 @@
 require_once('../../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
-$l10n = new OC_L10N('calendar');
 $tmpl = new OC_Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
index d45a70e1ce3..c02b8d10b8d 100755
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -10,7 +10,7 @@ require_once('../../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');
 
-$l = new OC_L10N('calendar');
+$l = OC_L10N::get('calendar');
 
 $lat = $_GET['lat'];
 $lng = $_GET['long'];
diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
index c639753fe2f..8dda28335f7 100644
--- a/apps/calendar/ajax/settings/settimezone.php
+++ b/apps/calendar/ajax/settings/settimezone.php
@@ -9,7 +9,7 @@
 // Init owncloud
 require_once('../../../../lib/base.php');
 
-$l=new OC_L10N('calendar');
+$l=OC_L10N::get('calendar');
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index f297c4d16d4..1fece8077ac 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-$l=new OC_L10N('calendar');
+$l=OC_L10N::get('calendar');
 OC::$CLASSPATH['OC_Calendar_App'] = 'apps/calendar/lib/app.php';
 OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 22c1133e006..4b481a4f286 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -9,7 +9,7 @@
 /**
  * This class manages our app actions
  */
-OC_Calendar_App::$l10n = new OC_L10N('calendar');
+OC_Calendar_App::$l10n = OC_L10N::get('calendar');
 class OC_Calendar_App{
 	public static $l10n;
 	protected static $categories = null;