diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 21:49:54 +0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 21:49:54 +0400 |
commit | ea2385432817dcf5ad47396d83932f564aa76e4b (patch) | |
tree | effc5c5489cf385ee79c73a4bea59605f53240f9 /apps/calendar | |
parent | ba0cf9817526e1206a25a5fe6d70255ab3c9e3bc (diff) | |
parent | fe6450002d6059260c743f48b6f40378454fa1dc (diff) |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
Diffstat (limited to 'apps/calendar')
-rw-r--r-- | apps/calendar/index.php | 13 | ||||
-rw-r--r-- | apps/calendar/l10n/bg_BG.php | 50 | ||||
-rw-r--r-- | apps/calendar/l10n/fr.php | 10 | ||||
-rw-r--r-- | apps/calendar/l10n/it.php | 12 | ||||
-rw-r--r-- | apps/calendar/l10n/ru.php | 44 | ||||
-rw-r--r-- | apps/calendar/l10n/tr.php | 50 | ||||
-rw-r--r-- | apps/calendar/lib/app.php | 4 | ||||
-rw-r--r-- | apps/calendar/templates/part.choosecalendar.rowfields.php | 2 | ||||
-rw-r--r-- | apps/calendar/templates/part.editevent.php | 6 | ||||
-rw-r--r-- | apps/calendar/templates/part.newevent.php | 2 |
10 files changed, 158 insertions, 35 deletions
diff --git a/apps/calendar/index.php b/apps/calendar/index.php index 4b871195927..cbfe0027b7b 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -24,8 +24,17 @@ foreach($calendars as $calendar){ } } -$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true'); -$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_r', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable' => 'false'); +$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php'); +$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_rw', + 'backgroundColor' => '#1D2D44', + 'borderColor' => '#888', + 'textColor' => 'white', + 'editable'=>'true'); +$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_r', + 'backgroundColor' => '#1D2D44', + 'borderColor' => '#888', + 'textColor' => 'white', + 'editable' => 'false'); OCP\Util::emitHook('OC_Calendar', 'getSources', array('sources' => &$eventSources)); $categories = OC_Calendar_App::getCategoryOptions(); diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php index e4f73d24a9a..592502b2687 100644 --- a/apps/calendar/l10n/bg_BG.php +++ b/apps/calendar/l10n/bg_BG.php @@ -1,7 +1,23 @@ <?php $TRANSLATIONS = array( +"No calendars found." => "Не са открити календари.", +"No events found." => "Не са открити събития.", +"Import failed" => "Грешка при внасяне", +"New Timezone:" => "Нов часови пояс:", "Timezone changed" => "Часовата зона е сменена", "Invalid request" => "Невалидна заявка", "Calendar" => "Календар", +"Birthday" => "Роджен ден", +"Clients" => "Клиенти", +"Holidays" => "Празници", +"Ideas" => "Идеи", +"Journey" => "Пътуване", +"Meeting" => "Среща", +"Other" => "Друго", +"Personal" => "Лично", +"Projects" => "Проекти", +"Questions" => "Въпроси", +"Work" => "Работа", +"New Calendar" => "Нов календар", "Does not repeat" => "Не се повтаря", "Daily" => "Дневно", "Weekly" => "Седмично", @@ -9,32 +25,64 @@ "Bi-Weekly" => "Двуседмично", "Monthly" => "Месечно", "Yearly" => "Годишно", +"never" => "никога", +"Monday" => "Понеделник", +"Tuesday" => "Вторник", +"Wednesday" => "Сряда", +"Thursday" => "Четвъртък", +"Friday" => "Петък", +"Saturday" => "Събота", +"Sunday" => "Неделя", "All day" => "Всички дни", +"Missing fields" => "Липсват полета", "Title" => "Заглавие", "Week" => "Седмица", "Month" => "Месец", +"List" => "Списък", "Today" => "Днес", "Calendars" => "Календари", "There was a fail, while parsing the file." => "Възникна проблем с разлистването на файла.", "Choose active calendars" => "Изберете активен календар", +"Your calendars" => "Вашите календари", +"Shared calendars" => "Споделени календари", +"No shared calendars" => "Няма споделени календари", +"Share Calendar" => "Споделяне на календар", "Download" => "Изтегляне", "Edit" => "Промяна", +"Delete" => "Изтриване", +"New calendar" => "Нов календар", "Edit calendar" => "Промени календар", "Displayname" => "Екранно име", "Active" => "Активен", "Calendar color" => "Цвят на календара", +"Save" => "Запис", "Submit" => "Продължи", +"Cancel" => "Отказ", "Edit an event" => "Промяна на събитие", +"Export" => "Изнасяне", +"Share" => "Споделяне", "Title of the Event" => "Наименование", "Category" => "Категория", +"Separate categories with commas" => "Отделете категориите със запетаи", +"Edit categories" => "Редактиране на категориите", "All Day Event" => "Целодневно събитие", "From" => "От", "To" => "До", +"Advanced options" => "Разширени настройки", "Location" => "Локация", "Location of the Event" => "Локация", "Description" => "Описание", "Description of the Event" => "Описание", "Repeat" => "Повтори", +"create a new calendar" => "създаване на нов календар", +"Please choose a calendar" => "Изберете календар", +"Name of new calendar" => "Име на новия календар", +"Import" => "Внасяне", +"Close Dialog" => "Затваряне на прозореца", "Create a new event" => "Ново събитие", -"Timezone" => "Часова зона" +"View an event" => "Преглед на събитие", +"No categories selected" => "Няма избрани категории", +"Timezone" => "Часова зона", +"First day of the week" => "Първи ден на седмицата", +"Groups" => "Групи" ); diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php index 289bc905b3c..c43b16631e4 100644 --- a/apps/calendar/l10n/fr.php +++ b/apps/calendar/l10n/fr.php @@ -12,12 +12,12 @@ "Timezone changed" => "Fuseau horaire modifié", "Invalid request" => "Requête invalide", "Calendar" => "Calendrier", -"ddd" => "jjj", -"ddd M/d" => "jjj M/j", -"dddd M/d" => "jjjj M/j", -"MMMM yyyy" => "MMMM aaaa", +"ddd" => "ddd", +"ddd M/d" => "ddd d/M", +"dddd M/d" => "dddd d/M", +"MMMM yyyy" => "MMMM yyyy", "MMM d[ yyyy]{ '—'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '—'[ MMM] d yyyy}", -"dddd, MMM d, yyyy" => "jjjj, MMM j, aaaa", +"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy", "Birthday" => "Anniversaire", "Business" => "Professionnel", "Call" => "Appel", diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php index b91e8b0df0b..68f3e89dae1 100644 --- a/apps/calendar/l10n/it.php +++ b/apps/calendar/l10n/it.php @@ -12,12 +12,12 @@ "Timezone changed" => "Fuso orario cambiato", "Invalid request" => "Richiesta non valida", "Calendar" => "Calendario", -"ddd" => "ggg", -"ddd M/d" => "ggg M/g", -"dddd M/d" => "gggg M/g", -"MMMM yyyy" => "MMMM aaaa", +"ddd" => "ddd", +"ddd M/d" => "ddd d/M", +"dddd M/d" => "dddd d/M", +"MMMM yyyy" => "MMMM yyyy", "MMM d[ yyyy]{ '—'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '—'[ MMM] d yyyy}", -"dddd, MMM d, yyyy" => "gggg, MMM g, aaaa", +"dddd, MMM d, yyyy" => "dddd, d MMM yyyy", "Birthday" => "Compleanno", "Business" => "Azienda", "Call" => "Chiama", @@ -141,7 +141,7 @@ "Share" => "Condividi", "Title of the Event" => "Titolo dell'evento", "Category" => "Categoria", -"Separate categories with commas" => "Categorie separate con virgole", +"Separate categories with commas" => "Categorie separate da virgole", "Edit categories" => "Modifica le categorie", "All Day Event" => "Evento che occupa tutta la giornata", "From" => "Da", diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php index af40b06b9ff..934e2c4840a 100644 --- a/apps/calendar/l10n/ru.php +++ b/apps/calendar/l10n/ru.php @@ -1,11 +1,23 @@ <?php $TRANSLATIONS = array( +"Not all calendars are completely cached" => "Не все календари полностью кешированы", +"Everything seems to be completely cached" => "Все, вроде бы, закешировано", "No calendars found." => "Календари не найдены.", "No events found." => "События не найдены.", "Wrong calendar" => "Неверный календарь", +"The file contained either no events or all events are already saved in your calendar." => "Файл либо не собержит событий, либо все события уже есть в календаре", +"events has been saved in the new calendar" => "события были сохранены в новый календарь", +"Import failed" => "Ошибка импорта", +"events has been saved in your calendar" => "события были сохранены в вашем календаре", "New Timezone:" => "Новый часовой пояс:", "Timezone changed" => "Часовой пояс изменён", "Invalid request" => "Неверный запрос", "Calendar" => "Календарь", +"ddd" => "ддд", +"ddd M/d" => "ддд М/д", +"dddd M/d" => "дддд М/д", +"MMMM yyyy" => "ММММ гггг", +"MMM d[ yyyy]{ '—'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '—'[ MMM] d yyyy}", +"dddd, MMM d, yyyy" => "дддд, МММ д, гггг", "Birthday" => "День рождения", "Business" => "Бизнес", "Call" => "Звонить", @@ -22,6 +34,7 @@ "Questions" => "Вопросы", "Work" => "Работа", "unnamed" => "без имени", +"New Calendar" => "Новый Календарь", "Does not repeat" => "Не повторяется", "Daily" => "Ежедневно", "Weekly" => "Еженедельно", @@ -66,8 +79,26 @@ "by day and month" => "по дню и месяцу", "Date" => "Дата", "Cal." => "Кал.", +"Sun." => "Вс.", +"Mon." => "Пн.", +"Tue." => "Вт.", +"Wed." => "Ср.", +"Thu." => "Чт.", +"Fri." => "Пт.", +"Sat." => "Сб.", +"Jan." => "Янв.", +"Feb." => "Фев.", +"Mar." => "Мар.", +"Apr." => "Апр.", +"May." => "Май.", +"Jun." => "Июн.", +"Jul." => "Июл.", +"Aug." => "Авг.", +"Sep." => "Сен.", +"Oct." => "Окт.", +"Nov." => "Ноя.", +"Dec." => "Дек.", "All day" => "Весь день", -"New Calendar" => "Новый Календарь", "Missing fields" => "Незаполненные поля", "Title" => "Название", "From Date" => "Дата начала", @@ -131,25 +162,24 @@ "Interval" => "Интервал", "End" => "Окончание", "occurrences" => "повторений", -"Import a calendar file" => "Импортировать календарь из файла", -"Please choose the calendar" => "Пожалуйста, выберите календарь", "create a new calendar" => "Создать новый календарь", +"Import a calendar file" => "Импортировать календарь из файла", +"Please choose a calendar" => "Пожалуйста, выберите календарь", "Name of new calendar" => "Название нового календаря", "Import" => "Импортировать", -"Importing calendar" => "Импортируется календарь", -"Calendar imported successfully" => "Календарь успешно импортирован", "Close Dialog" => "Закрыть Сообщение", "Create a new event" => "Создать новое событие", "View an event" => "Показать событие", "No categories selected" => "Категории не выбраны", -"Select category" => "Выбрать категорию", +"of" => "из", +"at" => "на", "Timezone" => "Часовой пояс", "Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса", "Timeformat" => "Формат времени", "24h" => "24ч", "12h" => "12ч", "First day of the week" => "Первый день недели", -"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:", +"more info" => "подробнее", "Users" => "Пользователи", "select users" => "выбрать пользователей", "Editable" => "Редактируемо", diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php index a72e4c39f6d..912228dc72a 100644 --- a/apps/calendar/l10n/tr.php +++ b/apps/calendar/l10n/tr.php @@ -1,12 +1,23 @@ <?php $TRANSLATIONS = array( +"Not all calendars are completely cached" => "Bütün takvimler tamamen ön belleğe alınmadı", +"Everything seems to be completely cached" => "Bütün herşey tamamen ön belleğe alınmış görünüyor", "No calendars found." => "Takvim yok.", "No events found." => "Etkinlik yok.", "Wrong calendar" => "Yanlış takvim", +"The file contained either no events or all events are already saved in your calendar." => "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı.", +"events has been saved in the new calendar" => "Etkinlikler yeni takvimde saklandı", +"Import failed" => "İçeri aktarma başarısız oldu.", +"events has been saved in your calendar" => "Etkinlikler takviminizde saklandı", "New Timezone:" => "Yeni Zamandilimi:", "Timezone changed" => "Zaman dilimi değiştirildi", "Invalid request" => "Geçersiz istek", "Calendar" => "Takvim", +"ddd" => "ddd", +"ddd M/d" => "ddd M/d", +"dddd M/d" => "dddd M/d", +"MMMM yyyy" => "MMMM yyyy", "MMM d[ yyyy]{ '—'[ MMM] d yyyy}" => "AAA g[ yyyy]{ '—'[ AAA] g yyyy}", +"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy", "Birthday" => "Doğum günü", "Business" => "İş", "Call" => "Arama", @@ -22,7 +33,9 @@ "Projects" => "Projeler", "Questions" => "Sorular", "Work" => "İş", +"by" => "hazırlayan", "unnamed" => "isimsiz", +"New Calendar" => "Yeni Takvim", "Does not repeat" => "Tekrar etmiyor", "Daily" => "Günlük", "Weekly" => "Haftalı", @@ -67,8 +80,26 @@ "by day and month" => "gün ve aya göre", "Date" => "Tarih", "Cal." => "Takv.", +"Sun." => "Paz.", +"Mon." => "Pzt.", +"Tue." => "Sal.", +"Wed." => "Çar.", +"Thu." => "Per.", +"Fri." => "Cum.", +"Sat." => "Cmt.", +"Jan." => "Oca.", +"Feb." => "Şbt.", +"Mar." => "Mar.", +"Apr." => "Nis", +"May." => "May.", +"Jun." => "Haz.", +"Jul." => "Tem.", +"Aug." => "Agu.", +"Sep." => "Eyl.", +"Oct." => "Eki.", +"Nov." => "Kas.", +"Dec." => "Ara.", "All day" => "Tüm gün", -"New Calendar" => "Yeni Takvim", "Missing fields" => "Eksik alanlar", "Title" => "Başlık", "From Date" => "Bu Tarihten", @@ -132,18 +163,17 @@ "Interval" => "Aralık", "End" => "Son", "occurrences" => "olaylar", -"Import a calendar file" => "Takvim dosyasını içeri aktar", -"Please choose the calendar" => "Lütfen takvimi seçin", "create a new calendar" => "Yeni bir takvim oluştur", +"Import a calendar file" => "Takvim dosyasını içeri aktar", +"Please choose a calendar" => "Lütfen takvim seçiniz", "Name of new calendar" => "Yeni takvimin adı", +"Take an available name!" => "Müsait ismi al !", +"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir.", "Import" => "İçe Al", -"Importing calendar" => "Takvim içe aktarılıyor", -"Calendar imported successfully" => "Takvim başarıyla içe aktarıldı", "Close Dialog" => "Diyalogu kapat", "Create a new event" => "Yeni olay oluştur", "View an event" => "Bir olay görüntüle", "No categories selected" => "Kategori seçilmedi", -"Select category" => "Kategori seçin", "of" => "nın", "at" => "üzerinde", "Timezone" => "Zaman dilimi", @@ -152,7 +182,13 @@ "24h" => "24s", "12h" => "12s", "First day of the week" => "Haftanın ilk günü", -"Calendar CalDAV syncing address:" => "CalDAV Takvim eşzamanlama adresi:", +"Cache" => "Önbellek", +"Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.", +"Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.", +"more info" => "daha fazla bilgi", +"Primary address (Kontact et al)" => "Öncelikli adres", +"iOS/OS X" => "iOS/OS X", +"Read only iCalendar link(s)" => "Sadece okunabilir iCalendar link(ler)i", "Users" => "Kullanıcılar", "select users" => "kullanıcıları seç", "Editable" => "Düzenlenebilir", diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 29e5ab5b0c8..8bdb54f4867 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -396,8 +396,8 @@ class OC_Calendar_App{ $last_modified = @$vevent->__get('LAST-MODIFIED'); $lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0; $staticoutput = array('id'=>(int)$event['id'], - 'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')), - 'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'', + 'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'), + 'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'', 'lastmodified'=>$lastmodified, 'allDay'=>$allday); if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){ diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php index 4492ce731c9..d29113c9a61 100644 --- a/apps/calendar/templates/part.choosecalendar.rowfields.php +++ b/apps/calendar/templates/part.choosecalendar.rowfields.php @@ -11,7 +11,7 @@ <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo rawurlencode(html_entity_decode($_['calendar']['uri'], ENT_QUOTES, 'UTF-8')) ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a> </td> <td width="20px"> - <a href="?app=calendar&getfile=export.php?calid=<?php echo $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a> + <a href="<?php echo OCP\Util::linkTo('calendar', 'export.php') . '?calid=' . $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a> </td> <td width="20px"> <a href="#" onclick="Calendar.UI.Calendar.edit(this, <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Edit') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>"></a> diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php index 102366f8f08..ea91192cc66 100644 --- a/apps/calendar/templates/part.editevent.php +++ b/apps/calendar/templates/part.editevent.php @@ -5,9 +5,9 @@ <?php echo $this->inc("part.eventform"); ?> <div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div> <span id="actions"> - <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/edit.php');"> - <input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('?app=calendar&getfile=ajax/event/delete.php');"> - <input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='?app=calendar&getfile=export.php?eventid=<?php echo $_['eventid'] ?>';"> + <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/edit.php') ?>');"> + <input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/delete.php') ?>');"> + <input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='<?php echo OCP\Util::linkTo('calendar', 'export.php') ?>?eventid=<?php echo $_['eventid'] ?>';"> </span> </form> </div> diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php index f4bb867b180..a4f48aecbc6 100644 --- a/apps/calendar/templates/part.newevent.php +++ b/apps/calendar/templates/part.newevent.php @@ -3,7 +3,7 @@ <?php echo $this->inc("part.eventform"); ?> <div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div> <span id="actions"> - <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/new.php');"> + <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/new.php') ?>');"> </span> </form> </div> |