fix merge conflicts

13 files changed, 29 insertions, 17 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 6307e1a0f27..fd7b709393a 100644
--- a/apps/calendar/ajax/event/delete.php
+++ b/apps/calendar/ajax/event/delete.php
@@ -17,4 +17,4 @@ if($access != 'owner' && $access != 'rw'){
 	exit;
 }
 $result = OC_Calendar_Object::delete($id);
-OC_JSON::success();
\ No newline at end of file
+OC_JSON::success();
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 fad1097cdce..3c990422f0c 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -23,4 +23,4 @@ foreach($events as $event){
 	
 }
 OC_JSON::encodedPrint($output);
-?>
\ No newline at end of file
+?>
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 b80076fadcb..c895be82838 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/appinfo/info.xml b/apps/calendar/appinfo/info.xml
index c38861e1589..101840aa1fa 100644
--- a/apps/calendar/appinfo/info.xml
+++ b/apps/calendar/appinfo/info.xml
@@ -2,7 +2,6 @@
 <info>
 	<id>calendar</id>
 	<name>Calendar</name>
-	<version>0.3</version>
 	<licence>AGPL</licence>
 	<author>Georg Ehrke, Bart Visscher, Jakob Sack</author>
 	<require>2</require>
diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
new file mode 100644
index 00000000000..1d71ef97443
--- /dev/null
+++ b/apps/calendar/appinfo/version
@@ -0,0 +1 @@
+0.3
\ No newline at end of file
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index ee1d39bc662..3ce0d6fa1d4 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -17,6 +17,10 @@ class OC_Calendar_App{
 	 * @brief language object for calendar app
 	 */
 	public static $l10n;
+	
+	/*
+	 * @brief categories of the user
+	 */
 	protected static $categories = null;
 
 	/*
@@ -107,7 +111,11 @@ class OC_Calendar_App{
 		}
 		return true;
 	}
-
+	
+	/*
+	 * @brief returns the default categories of ownCloud
+	 * @return (array) $categories
+	 */
 	protected static function getDefaultCategories()
 	{
 		return array(
@@ -128,14 +136,22 @@ class OC_Calendar_App{
 			self::$l10n->t('Work'),
 		);
 	}
-
+	
+	/*
+	 * @brief returns the vcategories object of the user
+	 * @return (object) $vcategories
+	 */
 	protected static function getVCategories() {
 		if (is_null(self::$categories)) {
 			self::$categories = new OC_VCategories('calendar', null, self::getDefaultCategories());
 		}
 		return self::$categories;
 	}
-
+	
+	/*
+	 * @brief returns the categories of the vcategories object
+	 * @return (array) $categories
+	 */
 	public static function getCategoryOptions()
 	{
 		$categories = self::getVCategories()->categories();
@@ -402,4 +418,4 @@ class OC_Calendar_App{
 		}
 		return $output;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 8405866392d..da5fa35bc21 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,6 +1,6 @@
 <?php
-class OC_Search_Provider_Calendar implements OC_Search_Provider{
-	static function search($query){
+class OC_Search_Provider_Calendar extends OC_Search_Provider{
+	function search($query){
 		$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
 		if(count($calendars)==0 || !OC_App::isEnabled('calendar')){
 			//return false;