diff options
Diffstat (limited to 'apps/tasks')
40 files changed, 437 insertions, 310 deletions
diff --git a/apps/tasks/ajax/addtask.php b/apps/tasks/ajax/addtask.php index 188e179236a..d98fdbf3888 100644 --- a/apps/tasks/ajax/addtask.php +++ b/apps/tasks/ajax/addtask.php @@ -22,7 +22,7 @@ $request['description'] = null; $vcalendar = OC_Task_App::createVCalendarFromRequest($request); $id = OC_Calendar_Object::add($cid, $vcalendar->serialize()); -$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); +$user_timezone = OC_Calendar_App::getTimezone(); $task = OC_Task_App::arrayForJSON($id, $vcalendar->VTODO, $user_timezone); OCP\JSON::success(array('task' => $task)); diff --git a/apps/tasks/ajax/addtaskform.php b/apps/tasks/ajax/addtaskform.php deleted file mode 100644 index 2795f393732..00000000000 --- a/apps/tasks/ajax/addtaskform.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -// Init owncloud -OCP\JSON::checkLoggedIn(); -OCP\JSON::checkAppEnabled('tasks'); -OCP\JSON::callCheck(); - -$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true); -$category_options = OC_Calendar_App::getCategoryOptions(); -$percent_options = range(0, 100, 10); -$priority_options = OC_Task_App::getPriorityOptions(); -$tmpl = new OCP\Template('tasks','part.addtaskform'); -$tmpl->assign('calendars',$calendars); -$tmpl->assign('category_options', $category_options); -$tmpl->assign('percent_options', $percent_options); -$tmpl->assign('priority_options', $priority_options); -$tmpl->assign('details', new OC_VObject('VTODO')); -$tmpl->assign('categories', ''); -$page = $tmpl->fetchPage(); - -OCP\JSON::success(array('data' => array( 'page' => $page ))); diff --git a/apps/tasks/ajax/edittask.php b/apps/tasks/ajax/edittask.php deleted file mode 100644 index 77ecff13e66..00000000000 --- a/apps/tasks/ajax/edittask.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php - -// Init owncloud -OCP\JSON::checkLoggedIn(); -OCP\JSON::checkAppEnabled('tasks'); -OCP\JSON::callCheck(); - -$l10n = new OC_L10N('tasks'); - -$id = $_POST['id']; -$vcalendar = OC_Calendar_App::getVCalendar($id); - -$errors = OC_Task_App::validateRequest($_POST); -if (!empty($errors)) { - OCP\JSON::error(array('data' => array( 'errors' => $errors ))); - exit(); -} - -OC_Task_App::updateVCalendarFromRequest($_POST, $vcalendar); -OC_Calendar_Object::edit($id, $vcalendar->serialize()); - -$priority_options = OC_Task_App::getPriorityOptions(); -$tmpl = new OCP\Template('tasks','part.details'); -$tmpl->assign('priority_options', $priority_options); -$tmpl->assign('details', $vcalendar->VTODO); -$tmpl->assign('id', $id); -$page = $tmpl->fetchPage(); - -$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); -$task = OC_Task_App::arrayForJSON($id, $vcalendar->VTODO, $user_timezone); - -OCP\JSON::success(array('data' => array( 'id' => $id, 'page' => $page, 'task' => $task ))); diff --git a/apps/tasks/ajax/edittaskform.php b/apps/tasks/ajax/edittaskform.php deleted file mode 100644 index e5a0a7297c5..00000000000 --- a/apps/tasks/ajax/edittaskform.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php - -// Init owncloud -OCP\JSON::checkLoggedIn(); -OCP\JSON::checkAppEnabled('tasks'); - -$id = $_GET['id']; -$details = OC_Calendar_App::getVCalendar($id)->VTODO; -$categories = $details->getAsString('CATEGORIES'); - -$category_options = OC_Calendar_App::getCategoryOptions(); -$percent_options = range(0, 100, 10); -$priority_options = OC_Task_App::getPriorityOptions(); - -$tmpl = new OCP\Template('tasks','part.edittaskform'); -$tmpl->assign('category_options', $category_options); -$tmpl->assign('percent_options', $percent_options); -$tmpl->assign('priority_options', $priority_options); -$tmpl->assign('id',$id); -$tmpl->assign('details',$details); -$tmpl->assign('categories', $categories); -$page = $tmpl->fetchPage(); - -OCP\JSON::success(array('data' => array( 'page' => $page ))); diff --git a/apps/tasks/ajax/getdetails.php b/apps/tasks/ajax/getdetails.php deleted file mode 100644 index 4ce469e0c9c..00000000000 --- a/apps/tasks/ajax/getdetails.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php - -// Init owncloud -OCP\JSON::checkLoggedIn(); -OCP\JSON::checkAppEnabled('tasks'); - -$l10n = new OC_L10N('tasks'); - -$id = $_GET['id']; -$task = OC_Calendar_Object::find($id); -$details = OC_VObject::parse($task['calendardata']); -if (!$details){ - OCP\JSON::error(); - exit; -} - -$priority_options = OC_Task_App::getPriorityOptions(); -$tmpl = new OCP\Template('tasks','part.details'); -$tmpl->assign('priority_options', $priority_options); -$tmpl->assign('details',$details->VTODO); -$tmpl->assign('id',$id); -$page = $tmpl->fetchPage(); - -OCP\JSON::success(array('data' => array( 'id' => $id, 'page' => $page ))); diff --git a/apps/tasks/ajax/gettasks.php b/apps/tasks/ajax/gettasks.php index 011730d0a13..b6183d9cb65 100644 --- a/apps/tasks/ajax/gettasks.php +++ b/apps/tasks/ajax/gettasks.php @@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('tasks'); $calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true); -$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); +$user_timezone = OC_Calendar_App::getTimezone(); $tasks = array(); foreach( $calendars as $calendar ){ diff --git a/apps/tasks/ajax/update_property.php b/apps/tasks/ajax/update_property.php index 46521cf6c58..679cfdefe48 100644 --- a/apps/tasks/ajax/update_property.php +++ b/apps/tasks/ajax/update_property.php @@ -9,6 +9,7 @@ // Init owncloud OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('tasks'); +OCP\JSON::callCheck(); $id = $_POST['id']; $property = $_POST['type']; @@ -38,7 +39,7 @@ switch($property) { $type = null; if ($due != 'false') { try { - $timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); + $timezone = OC_Calendar_App::getTimezone(); $timezone = new DateTimeZone($timezone); $due = new DateTime('@'.$due); $due->setTimezone($timezone); @@ -63,6 +64,6 @@ switch($property) { } OC_Calendar_Object::edit($id, $vcalendar->serialize()); -$user_timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); +$user_timezone = OC_Calendar_App::getTimezone(); $task_info = OC_Task_App::arrayForJSON($id, $vtodo, $user_timezone); OCP\JSON::success(array('data' => $task_info)); diff --git a/apps/tasks/appinfo/app.php b/apps/tasks/appinfo/app.php index f346e2aa4c0..e7c82d6f247 100644 --- a/apps/tasks/appinfo/app.php +++ b/apps/tasks/appinfo/app.php @@ -3,11 +3,6 @@ $l=new OC_L10N('tasks'); OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php'; OC::$CLASSPATH['OC_Task_App'] = 'apps/tasks/lib/app.php'; -OCP\App::register( array( - 'order' => 11, - 'id' => 'tasks', - 'name' => 'Tasks' )); - OCP\App::addNavigationEntry( array( 'id' => 'tasks_index', 'order' => 11, diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css index f6333f57b8a..80b6e777b5d 100644 --- a/apps/tasks/css/style.css +++ b/apps/tasks/css/style.css @@ -9,7 +9,7 @@ #tasks_lists .active{font-weight:bold;} #tasks_list h1{background-color:#1D2D44;color:white;font-size:120%;padding:0 0.5em;} -.task{border-radius:0.4em;position:relative;padding:0.5em 1em;} +.task{border-radius:0.4em;position:relative;padding:0.4em 1em;} .task:nth-child(odd){background-color:#F4F4F4;} .task:hover {background-color:#DDDDDD;} @@ -42,18 +42,19 @@ .task:hover .tag{opacity:0.5} .task:hover .tag:hover{opacity:0.8;} -.task .categories{position:absolute;right:12em;text-align:right;top:0.4em} +.task .categories{position:absolute;right:12em;text-align:right;top:0.5em} .task .categories a{background-color:#1d2d44;color:white;} .task .categories .tag.active{display:none;} .task input.categories{display:none;top:0;text-align:left;} -.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.4em} +.task .location{background-color:#442d44;color:white;position:absolute;right:0.6em;width:9.2em;text-align:left;top:0.5em} .task input.location{display:none;top:0;text-align:left;right:0.3em;background-color:white;color:#333333;} .task .more{display:none;margin-top:0.5em;} .task_less{display:none;} .task .description{position:relative;left:4em;} +.task textarea.description{width:35em;height:4em;} .task .due{position:absolute;right:0.3em;} .task .due .date{width:6em;} .task .due .time{width:6em;} diff --git a/apps/tasks/img/icon.png b/apps/tasks/img/icon.png Binary files differindex df281f3ba86..e2802ae9387 100644 --- a/apps/tasks/img/icon.png +++ b/apps/tasks/img/icon.png diff --git a/apps/tasks/index.php b/apps/tasks/index.php index 5e17ca454ec..f1c4d1e765c 100644 --- a/apps/tasks/index.php +++ b/apps/tasks/index.php @@ -21,12 +21,11 @@ OCP\Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker'); OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker'); OCP\Util::addScript('tasks', 'tasks'); OCP\Util::addStyle('tasks', 'style'); -OCP\Util::addScript('contacts','jquery.multi-autocomplete'); -OCP\Util::addScript('','oc-vcategories'); +OCP\Util::addScript('contacts', 'jquery.multi-autocomplete'); +OCP\Util::addScript('', 'oc-vcategories'); OCP\App::setActiveNavigationEntry('tasks_index'); $categories = OC_Calendar_App::getCategoryOptions(); -$l10n = new OC_L10N('tasks'); $priority_options = OC_Task_App::getPriorityOptions(); $output = new OCP\Template('tasks', 'tasks', 'user'); $output->assign('priority_options', $priority_options); diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js index bc92965bb0b..de627927507 100644 --- a/apps/tasks/js/tasks.js +++ b/apps/tasks/js/tasks.js @@ -469,67 +469,5 @@ $(document).ready(function(){ return false; }); - $('#tasks_addtaskform input[type="submit"]').live('click',function(){ - $.post('ajax/addtask.php',$('#tasks_addtaskform').serialize(),function(jsondata){ - if(jsondata.status == 'success'){ - $('#task_details').data('id',jsondata.data.id); - $('#task_details').html(jsondata.data.page); - $('#tasks_list').append(OC.Tasks.create_task_div(jsondata.data.task)); - } - else{ - alert(jsondata.data.message); - } - }, 'json'); - return false; - }); - - $('#tasks_edit').live('click',function(){ - var id = $('#task_details').data('id'); - $.getJSON('ajax/edittaskform.php',{'id':id},function(jsondata){ - if(jsondata.status == 'success'){ - $('#task_details').html(jsondata.data.page); - $('#task_details #categories').multiple_autocomplete({source: categories}); - } - else{ - alert(jsondata.data.message); - } - }); - return false; - }); - - $('#tasks_edittaskform #percent_complete').live('change',function(event){ - if ($(event.target).val() == 100){ - $('#tasks_edittaskform #complete').show(); - }else{ - $('#tasks_edittaskform #complete').hide(); - } - }); - - $('#tasks_edittaskform input[type="submit"]').live('click',function(){ - $.post('ajax/edittask.php',$('#tasks_edittaskform').serialize(),function(jsondata){ - $('.error_msg').remove(); - $('.error').removeClass('error'); - if(jsondata.status == 'success'){ - var id = jsondata.data.id; - $('#task_details').data('id',id); - $('#task_details').html(jsondata.data.page); - var task = jsondata.data.task; - $('#tasks .task[data-id='+id+']') - .data('task', task) - .html(OC.Tasks.create_task_div(task).html()); - } - else{ - var errors = jsondata.data.errors; - for (k in errors){ - $('#'+k).addClass('error') - .after('<span class="error_msg">'+errors[k]+'</span>'); - } - $('.error_msg').effect('highlight', {}, 3000); - $('.error').effect('highlight', {}, 3000); - } - }, 'json'); - return false; - }); - OCCategories.app = 'calendar'; }); diff --git a/apps/tasks/l10n/.gitkeep b/apps/tasks/l10n/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/apps/tasks/l10n/.gitkeep diff --git a/apps/tasks/l10n/ca.php b/apps/tasks/l10n/ca.php new file mode 100644 index 00000000000..2608d8b9b17 --- /dev/null +++ b/apps/tasks/l10n/ca.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "data/hora incorrecta", +"Tasks" => "Tasques", +"No category" => "Cap categoria", +"Unspecified" => "Sense especificar", +"1=highest" => "1=major", +"5=medium" => "5=mitjana", +"9=lowest" => "9=inferior", +"Empty Summary" => "Elimina el resum", +"Invalid percent complete" => "Percentatge completat no vàlid", +"Invalid priority" => "Prioritat no vàlida", +"Add Task" => "Afegeix una tasca", +"Order Due" => "Ordena per", +"Order List" => "Ordena per llista", +"Order Complete" => "Ordena els complets", +"Order Location" => "Ordena per ubicació", +"Order Priority" => "Ordena per prioritat", +"Order Label" => "Ordena per etiqueta", +"Loading tasks..." => "Carregant les tasques...", +"Important" => "Important", +"More" => "Més", +"Less" => "Menys", +"Delete" => "Elimina" +); diff --git a/apps/tasks/l10n/cs_CZ.php b/apps/tasks/l10n/cs_CZ.php new file mode 100644 index 00000000000..9da5f7ab607 --- /dev/null +++ b/apps/tasks/l10n/cs_CZ.php @@ -0,0 +1,15 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Neplatné datum/čas", +"Tasks" => "Úkoly", +"No category" => "Bez kategorie", +"1=highest" => "1=nejvyšší", +"5=medium" => "5=střední", +"9=lowest" => "9=nejnižší", +"Invalid priority" => "Neplatná priorita", +"Add Task" => "Přidat úkol", +"Loading tasks..." => "Načítám úkoly...", +"Important" => "Důležité", +"More" => "Více", +"Less" => "Méně", +"Delete" => "Smazat" +); diff --git a/apps/tasks/l10n/da.php b/apps/tasks/l10n/da.php new file mode 100644 index 00000000000..a413f22d17b --- /dev/null +++ b/apps/tasks/l10n/da.php @@ -0,0 +1,16 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Ugyldig dato/tid", +"Tasks" => "Opgaver", +"No category" => "Ingen kategori", +"Unspecified" => "Uspecificeret", +"1=highest" => "1=højeste", +"5=medium" => "5=mellem", +"9=lowest" => "9=laveste", +"Empty Summary" => "Tom beskrivelse", +"Add Task" => "Tilføj opgave", +"Loading tasks..." => "Indlæser opgaver...", +"Important" => "vigtigt", +"More" => "Mere", +"Less" => "Mindre", +"Delete" => "Slet" +); diff --git a/apps/tasks/l10n/de.php b/apps/tasks/l10n/de.php new file mode 100644 index 00000000000..29b9bf41ec6 --- /dev/null +++ b/apps/tasks/l10n/de.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Datum/Uhrzeit ungültig", +"Tasks" => "Aufgaben", +"No category" => "Keine Kategorie", +"Unspecified" => "Nicht angegeben", +"1=highest" => "1 = am höchsten", +"5=medium" => "5 = Durchschnitt", +"9=lowest" => "9 = am niedrigsten", +"Empty Summary" => "Leere Zusammenfassung", +"Invalid percent complete" => "Ungültige Prozent abgeschlossen", +"Invalid priority" => "Falsche Priorität", +"Add Task" => "Aufgabe hinzufügen", +"Order Due" => "Nach Fälligkeit sortieren", +"Order List" => "Nach Kategorie sortieren ", +"Order Complete" => "Nach Fertigstellung sortieren", +"Order Location" => "Nach Ort sortieren", +"Order Priority" => "Nach Priorität sortieren", +"Order Label" => "Nach Label sortieren", +"Loading tasks..." => "Lade Aufgaben ...", +"Important" => "Wichtig", +"More" => "Mehr", +"Less" => "Weniger", +"Delete" => "Löschen" +); diff --git a/apps/tasks/l10n/el.php b/apps/tasks/l10n/el.php new file mode 100644 index 00000000000..cdf2f609e5a --- /dev/null +++ b/apps/tasks/l10n/el.php @@ -0,0 +1,18 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Μην έγκυρη ημερομηνία / ώρα", +"Tasks" => "Εργασίες", +"No category" => "Χωρίς κατηγορία", +"Unspecified" => "Μη ορισμένο", +"1=highest" => "1=υψηλότερο", +"5=medium" => "5=μέτριο", +"9=lowest" => "9=χαμηλότερο", +"Empty Summary" => "Άδεια περίληψη", +"Invalid percent complete" => "Μη έγκυρο ποσοστό ολοκλήρωσης", +"Invalid priority" => "Μη έγκυρη προτεραιότητα ", +"Add Task" => "Προσθήκη εργασίας", +"Loading tasks..." => "Φόρτωση εργασιών...", +"Important" => "Σημαντικό ", +"More" => "Περισσότερα", +"Less" => "Λιγότερα", +"Delete" => "Διαγραφή" +); diff --git a/apps/tasks/l10n/eo.php b/apps/tasks/l10n/eo.php new file mode 100644 index 00000000000..9919a6ea63e --- /dev/null +++ b/apps/tasks/l10n/eo.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Nevalida dato/horo", +"Tasks" => "Taskoj", +"No category" => "Neniu kategorio", +"Unspecified" => "Nespecifita", +"1=highest" => "1=plej alta", +"5=medium" => "5=meza", +"9=lowest" => "9=plej malalta", +"Empty Summary" => "Malplena resumo", +"Invalid percent complete" => "Nevalida plenuma elcento", +"Invalid priority" => "Nevalida pligravo", +"Add Task" => "Aldoni taskon", +"Order Due" => "Ordigi laŭ limdato", +"Order List" => "Ordigi laŭ listo", +"Order Complete" => "Ordigi laŭ plenumo", +"Order Location" => "Ordigi laŭ loko", +"Order Priority" => "Ordigi laŭ pligravo", +"Order Label" => "Ordigi laŭ etikedo", +"Loading tasks..." => "Ŝargante taskojn...", +"Important" => "Grava", +"More" => "Pli", +"Less" => "Malpli", +"Delete" => "Forigi" +); diff --git a/apps/tasks/l10n/es.php b/apps/tasks/l10n/es.php new file mode 100644 index 00000000000..e5f0981de55 --- /dev/null +++ b/apps/tasks/l10n/es.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Fecha/hora inválida", +"Tasks" => "Tareas", +"No category" => "Sin categoría", +"Unspecified" => "Sin especificar", +"1=highest" => "1=mayor", +"5=medium" => "5=media", +"9=lowest" => "9=menor", +"Empty Summary" => "Resumen vacío", +"Invalid percent complete" => "Porcentaje completado inválido", +"Invalid priority" => "Prioridad inválida", +"Add Task" => "Agregar tarea", +"Order Due" => "Ordenar por", +"Order List" => "Ordenar por lista", +"Order Complete" => "Ordenar por completadas", +"Order Location" => "Ordenar por ubicación", +"Order Priority" => "Ordenar por prioridad", +"Order Label" => "Ordenar por etiqueta", +"Loading tasks..." => "Cargando tareas...", +"Important" => "Importante", +"More" => "Más", +"Less" => "Menos", +"Delete" => "Borrar" +); diff --git a/apps/tasks/l10n/et_EE.php b/apps/tasks/l10n/et_EE.php new file mode 100644 index 00000000000..56db6ee0327 --- /dev/null +++ b/apps/tasks/l10n/et_EE.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Vigane kuupäev/kellaaeg", +"Tasks" => "Ülesanded", +"No category" => "Kategooriat pole", +"Unspecified" => "Määramata", +"1=highest" => "1=kõrgeim", +"5=medium" => "5=keskmine", +"9=lowest" => "9=madalaim", +"Empty Summary" => "Tühi kokkuvõte", +"Invalid percent complete" => "Vigane edenemise protsent", +"Invalid priority" => "Vigane tähtsus", +"Add Task" => "Lisa ülesanne", +"Order Due" => "Tähtaja järgi", +"Order List" => "Nimekirja järgi", +"Order Complete" => "Edenemise järgi", +"Order Location" => "Asukoha järgi", +"Order Priority" => "Tähtsuse järjekorras", +"Order Label" => "Sildi järgi", +"Loading tasks..." => "Ülesannete laadimine...", +"Important" => "Tähtis", +"More" => "Rohkem", +"Less" => "Vähem", +"Delete" => "Kustuta" +); diff --git a/apps/tasks/l10n/fa.php b/apps/tasks/l10n/fa.php new file mode 100644 index 00000000000..40b5b610f4e --- /dev/null +++ b/apps/tasks/l10n/fa.php @@ -0,0 +1,11 @@ +<?php $TRANSLATIONS = array( +"Tasks" => "وظایف", +"1=highest" => "1=بیشترین", +"5=medium" => "5=متوسط", +"9=lowest" => "9=کمترین", +"Loading tasks..." => "درحال بارگزاری وظایف", +"Important" => "مهم", +"More" => "بیشتر", +"Less" => "کمتر", +"Delete" => "حذف" +); diff --git a/apps/tasks/l10n/fi_FI.php b/apps/tasks/l10n/fi_FI.php new file mode 100644 index 00000000000..7948e712e9c --- /dev/null +++ b/apps/tasks/l10n/fi_FI.php @@ -0,0 +1,17 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Virheellinen päivä tai aika", +"Tasks" => "Tehtävät", +"No category" => "Ei luokkaa", +"Unspecified" => "Määrittelemätön", +"1=highest" => "1=korkein", +"5=medium" => "5=keskitaso", +"9=lowest" => "9=matalin", +"Empty Summary" => "Tyhjä yhteenveto", +"Invalid priority" => "Virheellinen prioriteetti", +"Add Task" => "Lisää tehtävä", +"Loading tasks..." => "Ladataan tehtäviä...", +"Important" => "Tärkeä", +"More" => "Enemmän", +"Less" => "Vähemmän", +"Delete" => "Poista" +); diff --git a/apps/tasks/l10n/fr.php b/apps/tasks/l10n/fr.php new file mode 100644 index 00000000000..5b0a0321a87 --- /dev/null +++ b/apps/tasks/l10n/fr.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "date/heure invalide", +"Tasks" => "Tâches", +"No category" => "Sans catégorie", +"Unspecified" => "Non spécifié", +"1=highest" => "1=le plus important", +"5=medium" => "5=importance moyenne", +"9=lowest" => "9=le moins important", +"Empty Summary" => "Résumé vide", +"Invalid percent complete" => "Pourcentage d'achèvement invalide", +"Invalid priority" => "Priorité invalide", +"Add Task" => "Ajouter une tâche", +"Order Due" => "Echéance tâche", +"Order List" => "Liste tâche", +"Order Complete" => "Tâche réalisée", +"Order Location" => "Lieu", +"Order Priority" => "Priorité", +"Order Label" => "Etiquette tâche", +"Loading tasks..." => "Chargement des tâches…", +"Important" => "Important", +"More" => "Plus", +"Less" => "Moins", +"Delete" => "Supprimer" +); diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php new file mode 100644 index 00000000000..1aac8aac886 --- /dev/null +++ b/apps/tasks/l10n/it.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Ora/Data non valida", +"Tasks" => "Attività", +"No category" => "Nessuna categoria", +"Unspecified" => "Non specificata", +"1=highest" => "1=massima", +"5=medium" => "5=media", +"9=lowest" => "9=minima", +"Empty Summary" => "Riepilogo vuoto", +"Invalid percent complete" => "Percentuale di completamento non valida", +"Invalid priority" => "Priorità non valida", +"Add Task" => "Aggiungi attività", +"Order Due" => "Ordina per scadenza", +"Order List" => "Ordina per elenco", +"Order Complete" => "Ordina per completamento", +"Order Location" => "Ordina per posizione", +"Order Priority" => "Ordina per priorità", +"Order Label" => "Ordina per etichetta", +"Loading tasks..." => "Caricamento attività in corso...", +"Important" => "Importante", +"More" => "Più", +"Less" => "Meno", +"Delete" => "Elimina" +); diff --git a/apps/tasks/l10n/ja_JP.php b/apps/tasks/l10n/ja_JP.php new file mode 100644 index 00000000000..b5b526c595a --- /dev/null +++ b/apps/tasks/l10n/ja_JP.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "無効な日付／時刻", +"Tasks" => "タスク", +"No category" => "カテゴリ無し", +"Unspecified" => "未指定", +"1=highest" => "1=高", +"5=medium" => "5=中", +"9=lowest" => "9=低", +"Empty Summary" => "要旨が未記入", +"Invalid percent complete" => "進捗％が不正", +"Invalid priority" => "無効な優先度", +"Add Task" => "タスクを追加", +"Order Due" => "期日で並べ替え", +"Order List" => "リストで並び替え", +"Order Complete" => "完了で並べ替え", +"Order Location" => "場所で並べ替え", +"Order Priority" => "優先度で並べ替え", +"Order Label" => "ラベルで並べ替え", +"Loading tasks..." => "タスクをロード中...", +"Important" => "重要", +"More" => "詳細", +"Less" => "閉じる", +"Delete" => "削除" +); diff --git a/apps/tasks/l10n/lt_LT.php b/apps/tasks/l10n/lt_LT.php new file mode 100644 index 00000000000..7c17fc22242 --- /dev/null +++ b/apps/tasks/l10n/lt_LT.php @@ -0,0 +1,10 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Netinkama data/laikas", +"No category" => "Be kategorijos", +"Empty Summary" => "Tuščias aprašymas", +"Invalid percent complete" => "Netinkamas baigimo procentas", +"Important" => "Svarbūs", +"More" => "Daugiau", +"Less" => "Mažiau", +"Delete" => "Ištrinti" +); diff --git a/apps/tasks/l10n/nb_NO.php b/apps/tasks/l10n/nb_NO.php new file mode 100644 index 00000000000..a6b398857b0 --- /dev/null +++ b/apps/tasks/l10n/nb_NO.php @@ -0,0 +1,17 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "feil i dato/klokkeslett", +"Tasks" => "Oppgaver", +"No category" => "Ingen kategori", +"Unspecified" => "Uspesifisert", +"1=highest" => "1=høyest", +"5=medium" => "5=middels", +"9=lowest" => "9=lavest", +"Invalid percent complete" => "Feil i prosent fullført", +"Invalid priority" => "Ulovlig prioritet", +"Add Task" => "Legg til oppgave", +"Loading tasks..." => "Henter oppgaver...", +"Important" => "Viktig", +"More" => "Mer", +"Less" => "Mindre", +"Delete" => "Slett" +); diff --git a/apps/tasks/l10n/pl.php b/apps/tasks/l10n/pl.php new file mode 100644 index 00000000000..48796284869 --- /dev/null +++ b/apps/tasks/l10n/pl.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Zła data/czas", +"Tasks" => "Zadania", +"No category" => "Brak kategorii", +"Unspecified" => "Nieokreślona", +"1=highest" => "1=najwyższy", +"5=medium" => "5=średni", +"9=lowest" => "9=mało ważny ", +"Empty Summary" => "Podsumowanie puste", +"Invalid percent complete" => "Nieprawidłowy procent wykonania", +"Invalid priority" => "Nieprawidłowy priorytet", +"Add Task" => "Dodaj zadanie", +"Order Due" => "Kolejność - domyślna", +"Order List" => "Kolejność - wg lista", +"Order Complete" => "Kolejność - wg kompletności", +"Order Location" => "Kolejność - wg lokalizacja", +"Order Priority" => "Kolejność - wg priorytetu", +"Order Label" => "Kolejność - wg nazywy", +"Loading tasks..." => "Ładuję zadania", +"Important" => "Ważne", +"More" => "Więcej", +"Less" => "Mniej", +"Delete" => "Usuń" +); diff --git a/apps/tasks/l10n/ro.php b/apps/tasks/l10n/ro.php new file mode 100644 index 00000000000..54958582f5b --- /dev/null +++ b/apps/tasks/l10n/ro.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Data/timpul invalid", +"Tasks" => "Sarcini", +"No category" => "Fără categorie", +"Unspecified" => "Nespecificat", +"1=highest" => "1=cel mai înalt", +"5=medium" => "5=mediu", +"9=lowest" => "9=cel mai jos", +"Empty Summary" => "Rezumat gol", +"Invalid percent complete" => "Completare procentuală greșită", +"Invalid priority" => "Prioritare greșită", +"Add Task" => "Adaugă sarcină", +"Order Due" => "Comandă până la", +"Order List" => "Lista de comenzi", +"Order Complete" => "Comandă executată", +"Order Location" => "Locația comenzii", +"Order Priority" => "Prioritarea comenzii", +"Order Label" => "Eticheta comenzii", +"Loading tasks..." => "Încărcare sarcini", +"Important" => "Important", +"More" => "Mai mult", +"Less" => "Mai puțin", +"Delete" => "Șterge" +); diff --git a/apps/tasks/l10n/sl.php b/apps/tasks/l10n/sl.php new file mode 100644 index 00000000000..c235ff0bc47 --- /dev/null +++ b/apps/tasks/l10n/sl.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Neveljaven datum/čas", +"Tasks" => "Opravila", +"No category" => "Ni kategorije", +"Unspecified" => "Nedoločen", +"1=highest" => "1=najvišje", +"5=medium" => "5=srednje", +"9=lowest" => "9=najnižje", +"Empty Summary" => "Prazen povzetek", +"Invalid percent complete" => "Neveljaven odstotek dokončanja", +"Invalid priority" => "Neveljavna prednost", +"Add Task" => "Dodaj opravilo", +"Order Due" => "Razvrsti po roku", +"Order List" => "Razvrsti v seznam", +"Order Complete" => "Razvrsti po zaključenosti", +"Order Location" => "Razvrsti po lokacijah", +"Order Priority" => "Razvrsti po prednosti", +"Order Label" => "Razvrsti po oznakah", +"Loading tasks..." => "Nalagam opravila...", +"Important" => "Pomembno", +"More" => "Več", +"Less" => "Manj", +"Delete" => "Izbriši" +); diff --git a/apps/tasks/l10n/sv.php b/apps/tasks/l10n/sv.php new file mode 100644 index 00000000000..33bab14448f --- /dev/null +++ b/apps/tasks/l10n/sv.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "Felaktigt datum/tid", +"Tasks" => "Uppgifter", +"No category" => "Ingen kategori", +"Unspecified" => "Ospecificerad ", +"1=highest" => "1=högsta", +"5=medium" => "5=mellan", +"9=lowest" => "9=lägsta", +"Empty Summary" => "Tom sammanfattning", +"Invalid percent complete" => "Ogiltig andel procent klar", +"Invalid priority" => "Felaktig prioritet", +"Add Task" => "Lägg till uppgift", +"Order Due" => "Förfaller", +"Order List" => "Kategori", +"Order Complete" => "Slutförd", +"Order Location" => "Plats", +"Order Priority" => "Prioritet", +"Order Label" => "Etikett", +"Loading tasks..." => "Laddar uppgifter...", +"Important" => "Viktigt", +"More" => "Mer", +"Less" => "Mindre", +"Delete" => "Radera" +); diff --git a/apps/tasks/l10n/th_TH.php b/apps/tasks/l10n/th_TH.php new file mode 100644 index 00000000000..e4212bf291c --- /dev/null +++ b/apps/tasks/l10n/th_TH.php @@ -0,0 +1,24 @@ +<?php $TRANSLATIONS = array( +"Invalid date/time" => "วันที่ / เวลา ไม่ถูกต้อง", +"Tasks" => "งาน", +"No category" => "ไม่มีหมวดหมู่", +"Unspecified" => "ยังไม่ได้ระบุ", +"1=highest" => "1=สูงสุด", +"5=medium" => "5=ปานกลาง", +"9=lowest" => "9=ต่ำสุด", +"Empty Summary" => "ข้อมูลสรุปยังว่างอยู่", +"Invalid percent complete" => "สัดส่วนเปอร์เซ็นต์ความสมบูรณ์ไม่ถูกต้อง", +"Invalid priority" => "ความสำคัญไม่ถูกต้อง", +"Add Task" => "เพิ่มงานใหม่", +"Order Due" => "จัดเรียงตามกำหนดเวลา", +"Order List" => "จัดเรียงตามรายชื่อ", +"Order Complete" => "จัดเรียงตามความสมบูรณ์", +"Order Location" => "จัดเรียงตามตำแหน่งที่อยู่", +"Order Priority" => "จัดเรียงตามระดับความสำคัญ", +"Order Label" => "จัดเรียงตามป้ายชื่อ", +"Loading tasks..." => "กำลังโหลดข้อมูลงาน...", +"Important" => "สำคัญ", +"More" => "มาก", +"Less" => "น้อย", +"Delete" => "ลบ" +); diff --git a/apps/tasks/lib/app.php b/apps/tasks/lib/app.php index 7b908420333..a97c6b95d1d 100644 --- a/apps/tasks/lib/app.php +++ b/apps/tasks/lib/app.php @@ -77,24 +77,24 @@ class OC_Task_App { public static function validateRequest($request) { $errors = array(); - if($request['summary'] == ''){ + if($request['summary'] == '') { $errors['summary'] = self::$l10n->t('Empty Summary'); } try { - $timezone = OCP\Config::getUserValue(OCP\User::getUser(), "calendar", "timezone", "Europe/London"); + $timezone = OC_Calendar_App::getTimezone(); $timezone = new DateTimeZone($timezone); new DateTime($request['due'], $timezone); } catch (Exception $e) { $errors['due'] = self::$l10n->t('Invalid date/time'); } - if ($request['percent_complete'] < 0 || $request['percent_complete'] > 100){ + if ($request['percent_complete'] < 0 || $request['percent_complete'] > 100) { $errors['percent_complete'] = self::$l10n->t('Invalid percent complete'); } - if ($request['percent_complete'] == 100 && !empty($request['completed'])){ + if ($request['percent_complete'] == 100 && !empty($request['completed'])) { try { - $timezone = OCP\Config::getUserValue(OCP\User::getUser(), "calendar", "timezone", "Europe/London"); + $timezone = OC_Calendar_App::getTimezone(); $timezone = new DateTimeZone($timezone); new DateTime($request['completed'], $timezone); } catch (Exception $e) { @@ -147,7 +147,7 @@ class OC_Task_App { $vtodo->setString('PRIORITY', $priority); if ($due) { - $timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); + $timezone = OC_Calendar_App::getTimezone(); $timezone = new DateTimeZone($timezone); $due = new DateTime($due, $timezone); $vtodo->setDateTime('DUE', $due); @@ -168,18 +168,19 @@ class OC_Task_App { $vtodo->__unset('PERCENT-COMPLETE'); } - if ($percent_complete == 100){ - if (!$completed){ + if ($percent_complete == 100) { + if (!$completed) { $completed = 'now'; } } else { $completed = null; } if ($completed) { - $timezone = OCP\Config::getUserValue(OCP\User::getUser(), 'calendar', 'timezone', date_default_timezone_get()); + $timezone = OC_Calendar_App::getTimezone(); $timezone = new DateTimeZone($timezone); $completed = new DateTime($completed, $timezone); $vtodo->setDateTime('COMPLETED', $completed); + OCP\Util::emitHook('OC_Task', 'taskCompleted', $vtodo); } else { unset($vtodo->COMPLETED); } diff --git a/apps/tasks/templates/part.addtaskform.php b/apps/tasks/templates/part.addtaskform.php deleted file mode 100644 index 0fad5592aa7..00000000000 --- a/apps/tasks/templates/part.addtaskform.php +++ /dev/null @@ -1,15 +0,0 @@ -<form id="tasks_addtaskform"> - <?php if(count($_['calendars'])==1): ?> - <input type="hidden" name="id" value="<?php echo $_['calendars'][0]['id']; ?>"> - <?php else: ?> - <label for="id"><?php echo $l->t('Calendar'); ?></label> - <select name="id" size="1"> - <?php foreach($_['calendars'] as $calendar): ?> - <option value="<?php echo $calendar['id']; ?>"><?php echo $calendar['displayname']; ?></option> - <?php endforeach; ?> - </select> - <br> - <?php endif; ?> - <?php echo $this->inc('part.taskform'); ?> - <input type="submit" name="submit" value="<?php echo $l->t('Create Task'); ?>"> -</form> diff --git a/apps/tasks/templates/part.details.php b/apps/tasks/templates/part.details.php deleted file mode 100644 index 89636b6e762..00000000000 --- a/apps/tasks/templates/part.details.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php if(isset($_['details']->SUMMARY)): ?> -<table> -<?php -echo $this->inc('part.property', array('label' => $l->t('Summary'), 'property' => $_['details']->SUMMARY)); -if(isset($_['details']->LOCATION)): - echo $this->inc('part.property', array('label' => $l->t('Location'), 'property' => $_['details']->LOCATION)); -endif; -if(isset($_['details']->CATEGORIES)): - echo $this->inc('part.property', array('label' => $l->t('Categories'), 'property' => $_['details']->CATEGORIES)); -endif; -if(isset($_['details']->DUE)): - echo $this->inc('part.property', array('label' => $l->t('Due'), 'property' => $_['details']->DUE[0])); -endif; -if(isset($_['details']->PRIORITY)): - echo $this->inc('part.property', array('label' => $l->t('Priority'), 'property' => $_['details']->PRIORITY[0], 'options' => $_['priority_options'])); -endif; -if($_['details']->__isset('PERCENT-COMPLETE') || isset($_['details']->COMPLETED)): -?> -<tr> - <th> - <?php echo $l->t('Complete') ?> - </th> - <td> -<?php if($_['details']->__isset('PERCENT-COMPLETE')): - echo $_['details']->__get('PERCENT-COMPLETE')->value.' % '; - endif; - if(isset($_['details']->COMPLETED)): - echo $l->t('on '). $l->l('datetime', $_['details']->COMPLETED[0]->getDateTime()); - endif; - echo '</tr>'; -endif; -if(isset($_['details']->DESCRIPTION)): - echo $this->inc('part.property', array('label' => $l->t('Description'), 'property' => $_['details']->DESCRIPTION)); -endif; ?> -</table> -<form> - <input type="button" id="tasks_delete" value="<?php echo $l->t('Delete');?>"> - <input type="button" id="tasks_edit" value="<?php echo $l->t('Edit');?>"> -</form> -<?php else: ?> -<?php //var_dump($_['details']); ?> -<?php endif ?> diff --git a/apps/tasks/templates/part.edittaskform.php b/apps/tasks/templates/part.edittaskform.php deleted file mode 100644 index fe123f07ac6..00000000000 --- a/apps/tasks/templates/part.edittaskform.php +++ /dev/null @@ -1,5 +0,0 @@ -<form id="tasks_edittaskform"> - <input type="hidden" name="id" value="<?php echo $_['id']; ?>"> - <?php echo $this->inc('part.taskform'); ?> - <input type="submit" name="submit" value="<?php echo $l->t('Update Task'); ?>"> -</form> diff --git a/apps/tasks/templates/part.property.php b/apps/tasks/templates/part.property.php deleted file mode 100644 index 591fd363e6f..00000000000 --- a/apps/tasks/templates/part.property.php +++ /dev/null @@ -1,22 +0,0 @@ -<tr> - <th> - <?php echo $_['label'] ?> - </th> - <td> - <?php - switch (get_class($_['property'])) - { - case 'Sabre_VObject_Element_DateTime': - echo $l->l('datetime', $_['property']->getDateTime()); - break; - default: - $value = $_['property']->value; - if (isset($_['options'])) - { - $value = $_['options'][$value]; - } - echo nl2br($value); - } - ?> - </td> -</tr> diff --git a/apps/tasks/templates/part.taskform.php b/apps/tasks/templates/part.taskform.php deleted file mode 100644 index c00560903b0..00000000000 --- a/apps/tasks/templates/part.taskform.php +++ /dev/null @@ -1,36 +0,0 @@ - <label for="summary"><?php echo $l->t('Summary'); ?></label> - <input type="text" id="summary" name="summary" placeholder="<?php echo $l->t('Summary of the task');?>" value="<?php echo isset($_['details']->SUMMARY) ? $_['details']->SUMMARY[0]->value : '' ?>"> - <br> - <label for="location"><?php echo $l->t('Location'); ?></label> - <input type="text" id="location" name="location" placeholder="<?php echo $l->t('Location of the task');?>" value="<?php echo isset($_['details']->LOCATION) ? $_['details']->LOCATION[0]->value : '' ?>"> - <br> - <label for="categories"><?php echo $l->t('Categories'); ?></label> - <input id="categories" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>"> - <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a> - <br> - <label for="due"><?php echo $l->t('Due'); ?></label> - <input type="text" id="due" name="due" placeholder="<?php echo $l->t('Due date') ?>" value="<?php echo isset($_['details']->DUE) ? $l->l('datetime', $_['details']->DUE[0]->getDateTime()) : '' ?>"> - <br> - <select name="percent_complete" id="percent_complete"> - <?php - foreach($_['percent_options'] as $percent){ - echo '<option value="' . $percent . '"' . (($_['details']->__get('PERCENT-COMPLETE') && $percent == $_['details']->__get('PERCENT-COMPLETE')->value) ? ' selected="selected"' : '') . '>' . $percent . ' %</option>'; - } - ?> - </select> - <label for="percent_complete"><?php echo $l->t('Complete'); ?></label> - <span id="complete"<?php echo ($_['details']->__get('PERCENT-COMPLETE') && $_['details']->__get('PERCENT-COMPLETE')->value == 100) ? '' : ' style="display:none;"' ?>><label for="completed"><?php echo $l->t('completed on'); ?></label> - <input type="text" id="completed" name="completed" value="<?php echo isset($_['details']->COMPLETED) ? $l->l('datetime', $_['details']->COMPLETED[0]->getDateTime()) : '' ?>"></span> - <br> - <label for="priority"><?php echo $l->t('Priority'); ?></label> - <select name="priority"> - <?php - foreach($_['priority_options'] as $priority => $label){ - echo '<option value="' . $priority . '"' . ((isset($_['details']->PRIORITY) && $priority == $_['details']->PRIORITY->value) ? ' selected="selected"' : '') . '>' . $label . '</option>'; - } - ?> - </select> - <br> - <label for="description"><?php echo $l->t('Description'); ?></label><br> - <textarea placeholder="<?php echo $l->t('Description of the task');?>" name="description"><?php echo isset($_['details']->DESCRIPTION) ? $_['details']->DESCRIPTION[0]->value : '' ?></textarea> - <br> diff --git a/apps/tasks/templates/part.tasks.php b/apps/tasks/templates/part.tasks.php deleted file mode 100644 index 50be1cd6bed..00000000000 --- a/apps/tasks/templates/part.tasks.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php foreach( $_['tasks'] as $task ): ?> - <li data-id="<?php echo $task['id']; ?>"><a href="index.php?id=<?php echo $task['id']; ?>"><?php echo $task['name']; ?></a> </li> -<?php endforeach; ?> |
