diff --git a/app/Domain/Comments/Repositories/Comments.php b/app/Domain/Comments/Repositories/Comments.php index be17d2e672..c4f868740b 100644 --- a/app/Domain/Comments/Repositories/Comments.php +++ b/app/Domain/Comments/Repositories/Comments.php @@ -252,15 +252,13 @@ public function deleteComment($id): bool */ public function editComment($text, $id): bool { - $sql = "UPDATE zp_comment SET text = :text WHERE id = :id"; $stmn = $this->db->database->prepare($sql); $stmn->bindValue(':id', $id, PDO::PARAM_INT); - $stmn->bindValue(':text', $text, PDO::PARAM_INT); + $stmn->bindValue(':text', $text, PDO::PARAM_STR); $result = $stmn->execute(); $stmn->closeCursor(); - return $result; } } diff --git a/app/Domain/Comments/Services/Comments.php b/app/Domain/Comments/Services/Comments.php index 7a7383d91d..b62ef433a4 100644 --- a/app/Domain/Comments/Services/Comments.php +++ b/app/Domain/Comments/Services/Comments.php @@ -60,7 +60,6 @@ public function getComments($module, $entityId, int $commentOrder = 0): false|ar */ public function addComment($values, $module, $entityId, $entity): bool { - if (isset($values['text']) && $values['text'] != '' && isset($values['father']) && isset($module) && isset($entityId) && isset($entity)) { $mapper = array( 'text' => $values['text'], @@ -120,9 +119,16 @@ public function addComment($values, $module, $entityId, $entity): bool } /** - * @param $commentId + * @param $values + * @param $id * @return bool + * @throws BindingResolutionException */ + public function editComment($values, $id): bool + { + return $this->commentRepository->editComment($values['text'], $id); + } + /** * @param $commentId * @return bool @@ -132,6 +138,7 @@ public function deleteComment($commentId): bool return $this->commentRepository->deleteComment($commentId); } + } } diff --git a/app/Domain/Comments/Templates/submodules/generalComment.sub.php b/app/Domain/Comments/Templates/submodules/generalComment.sub.php index 748c8c1c69..9555a6d3bd 100644 --- a/app/Domain/Comments/Templates/submodules/generalComment.sub.php +++ b/app/Domain/Comments/Templates/submodules/generalComment.sub.php @@ -23,7 +23,7 @@ &v=timestamp() ?>" />
- + __('links.add_new_comment') ?>
@@ -39,6 +39,7 @@ +
@@ -47,11 +48,11 @@
get('comments') as $row) : ?>
-
+
-
+
__('text.written_on'), @@ -70,6 +71,13 @@ __('links.delete') ?> + +
  • + + __('label.edit') ?> + +
  • + get('ticket')->id)) {?>
  • __("links.add_to_timesheets"); ?>
  • @@ -80,16 +88,13 @@
    __('text.full_name'), $tpl->escape($row['firstname']), $tpl->escape($row['lastname'])); ?>
    - escapeMinimal($row['text']); ?> +
    escapeMinimal($row['text']); ?>
    - -
    - - @@ -139,7 +147,8 @@ class="deleteComment formModal"> &v=timestamp() ?>"/>
    - + +
    @@ -157,28 +166,40 @@ class="deleteComment formModal"> leantime.editorController.initSimpleEditor(); - function toggleCommentBoxes(id, formHash) { - + function toggleCommentBoxes(id, commentId, formHash,editComment = false, isReply = false) { - if (id == 0) { - jQuery('.mainToggler-'+formHash).hide(); + + + if (parseInt(id, 10) === 0) { + jQuery(`.mainToggler-${formHash}`).hide(); } else { - jQuery('.mainToggler-'+formHash).show(); + jQuery(`.mainToggler-${formHash}`).show(); + } + if (editComment) { + jQuery(`#comment-to-hide-on-edit-${formHash}-${id}`).hide(); + jQuery(`#comment-link-to-hide-on-edit-${formHash}-${id}`).hide(); + jQuery(`#comment-image-to-hide-on-edit-${formHash}-${id}`).hide(); + jQuery(`#edit-comment-helper-${formHash}`).val(commentId || id); + jQuery('#submit-reply-button').val('__('buttons.save') ?>'); } - jQuery('.commentBox-'+formHash+' textarea').remove(); - - jQuery('.commentBox-'+formHash+'').hide(); - jQuery('#comment-'+formHash+'-' + id + ' .commentReply').prepend(''); + jQuery(`.commentBox-${formHash} textarea`).remove(); + jQuery(`.commentBox-${formHash}`).hide(); + jQuery(`#comment-${formHash}-${id} .commentReply`).prepend(``); leantime.editorController.initSimpleEditor(); + tinyMCE.get(`editor_${formHash}-${id}`).focus(); + jQuery(`#comment-${formHash}-${id}`).show(); + jQuery(`#father-${formHash}`).val(id); - setTimeout(function () { // you may not need the timeout - tinyMCE.get('editor_'+formHash+'').focus(); - }, 50); - - jQuery('#comment-'+formHash+'-' + id + '').show(); - jQuery('#father-'+formHash).val(id); - + + } + function cancel(id, formHash) { + + jQuery(`#comment-to-hide-on-edit-${formHash}-${id}`).show(); + jQuery(`.commentBox-${formHash} textarea`).remove(); + jQuery(`#comment-link-to-hide-on-edit-${formHash}-${id}`).show(); + jQuery(`#comment-image-to-hide-on-edit-${formHash}-${id}`).show(); + jQuery(`#comment-${formHash}-${id}`).hide(); } diff --git a/app/Domain/Tickets/Controllers/ShowTicket.php b/app/Domain/Tickets/Controllers/ShowTicket.php index 9b428dfe96..59ed2580f9 100644 --- a/app/Domain/Tickets/Controllers/ShowTicket.php +++ b/app/Domain/Tickets/Controllers/ShowTicket.php @@ -110,7 +110,6 @@ public function get($params): Response $this->tpl->setNotification($this->language->__("notifications.comment_deleted_error"), "error"); } - //Delete Subtask if (isset($params['delSubtask']) === true) { @@ -205,8 +204,15 @@ public function post($params): Response $tab = "#files"; } - //Add a comment - if (isset($params['comment']) === true && isset($params['text']) && $params['text'] != '') { + // Add or edit a comment + if (isset($params['comment']) === true && isset($params['text']) && $params['text'] != '' && isset($params['edit-comment-helper']) && $params['edit-comment-helper'] !== "") { + if ($this->commentService->editComment($_POST, (int)$params['edit-comment-helper'])) { + $this->tpl->setNotification($this->language->__("notifications.comment_edited_success"), "success"); + } else { + $this->tpl->setNotification($this->language->__("notifications.comment_edit_error"), "error"); + } + $tab = "#comment"; + } else if (isset($params['comment']) === true && isset($params['text']) && $params['text'] != '') { if ($this->commentService->addComment($_POST, "ticket", $id, $ticket)) { $this->tpl->setNotification($this->language->__("notifications.comment_create_success"), "success"); } else { diff --git a/app/Language/ar-SA.ini b/app/Language/ar-SA.ini index 25be530fa8..78957fcfd8 100644 --- a/app/Language/ar-SA.ini +++ b/app/Language/ar-SA.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="File was uploaded successfully" notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" diff --git a/app/Language/cs-CZ.ini b/app/Language/cs-CZ.ini index e9eca794ab..6777734a37 100644 --- a/app/Language/cs-CZ.ini +++ b/app/Language/cs-CZ.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="File was uploaded successfully" notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" diff --git a/app/Language/da-DK.ini b/app/Language/da-DK.ini index abaca71278..47f397ec6a 100644 --- a/app/Language/da-DK.ini +++ b/app/Language/da-DK.ini @@ -66,7 +66,7 @@ headlines.start_new_idea_board="Start en ny ide-tavle" headlines.have_an_idea="Har du en idé?" headlines.attached_milestone="Tilknyttet milepæl" headlines.no_milestone_attached="Du har ingen tilknyttede milepæle!" -headline.delete_ticket="Slet To-Do" +headline.delete_ticket="Slet to-do" headline.project="Projekt: %1$s" headline.milestone=" Milepæl" headline.milestones="Milepæle" @@ -159,10 +159,10 @@ tabs.notifications=" Notifikationer" subtitles.sprint_burndown="Sprint Burndown" subtitles.backlog_burndown="Backlog Burndown" -subtitles.todos_this_week="To-Dos denne uge (%1$s)" -subtitles.todo="To-Do" +subtitles.todos_this_week="To-dos denne uge (%1$s)" +subtitles.todo="To-do" subtitles.track_time="Registrer tid" -subtitles.todos_later="To-Dos Senere" +subtitles.todos_later="To-dos Senere" subtitles.project_progress="Projekt Fremgang" subtitles.milestone_progress="Milepæl Fremgang" subtitle.general="Generelt" @@ -198,23 +198,25 @@ notifications.no_template="Kunne ikke finde skabelon" notifications.file_upload_success="Fil blev uploadet succesfuldt" notifications.file_upload_error="Fil kunne ikke uploades" notifications.comment_create_success="Kommentar oprettet succesfuldt" -notifications.comment_create_error="Kommentar kunne ikke tilføjes" +notifications.comment_edited_success="Kommentar redigeret succesfuldt" +notifications.comment_edit_error="Kommentaren blev ikke redigeret" +notifications.comment_create_error="Kommentaren blev ikke tilføjet" notifications.time_logged_success="Tid registreret succesfuldt" notifications.time_logged_error="Der opstod et problem med at registrere din tid" notifications.time_logged_error_no_hours="Tilføj venligst mere end 0 timer" notifications.time_logged_error_no_date="Tilføj venligst en dato" notifications.time_logged_error_no_kind="Tilføj venligst typen af tid registreret" notifications.time_logged_error_no_ticket="Tilføj venligst to-do for den registrerede tid" -notifications.ticket_save_error_no_headline="Indtast venligst en titel for din To-Do" -notifications.ticket_saved="To-Do blev gemt succesfuldt" +notifications.ticket_save_error_no_headline="Indtast venligst en titel for din to-do" +notifications.ticket_saved="To-do blev gemt succesfuldt" notifications.comment_deleted="Kommentar slettet succesfuldt" notifications.comment_deleted_error="Kommentar kunne ikke slettes" notifications.file_deleted="Fil slettet succesfuldt" notifications.file_deleted_error="Fil kunne ikke slettes" -notifications.ticket_save_error_no_access="Du har ikke tilladelse til at foretage ændringer i denne To-Do" +notifications.ticket_save_error_no_access="Du har ikke tilladelse til at foretage ændringer i denne to-do" notifications.subtask_saved="Underopgave blev gemt" notifications.subtask_save_error="Der opstod et problem med at gemme din underopgave" -notifications.ticket_delete_error="Du har ikke tilladelse til at slette denne To-Do" +notifications.ticket_delete_error="Du har ikke tilladelse til at slette denne to-do" notifications.subtask_deleted="Underopgave blev slettet" notifications.subtask_delete_error="Der opstod et problem med at slette din underopgave" notifications.problem_updating_user="Der opstod et problem med at oprette kontoen" @@ -222,14 +224,14 @@ notifications.you_are_active="Tillykke, din konto blev oprettet succesfuldt. Du notification.noProjects="Du har i øjeblikket ingen tildelte projekter. Bed en administrator om at tildele dig et projekt" notification.noProjectsCreateNew="Du har i øjeblikket ingen tildelte projekter. Opret venligst et nyt projekt, før du fortsætter" -notification.todo_deleted="To-Do blev slettet succesfuldt" +notification.todo_deleted="To-do blev slettet succesfuldt" notification.milestone_deleted="Milepæl blev slettet succesfuldt" notification.saved_mattermost_webhook="Mattermost Webhook URL blev gemt succesfuldt" notification.saved_slack_webhook="Slack Webhook URL blev gemt succesfuldt" notification.saved_discord_webhook="Discord Webhook URL blev gemt succesfuldt" notification.saved_zulip_webhook="Zulip integration blev gemt succesfuldt" notification.error_zulip_webhook_fill_out_fields="Zulip integration kunne ikke gemmes. Udfyld venligst alle felter" -notification.project_has_tickets="Projektet har stadig To-Dos" +notification.project_has_tickets="Projektet har stadig to-dos" notification.project_saved="Projekt blev gemt succesfuldt" notification.no_project_name="Projektnavn blev ikke angivet" notification.no_client="Klient blev ikke valgt" @@ -237,7 +239,7 @@ notification.wiki_created_successfully="Wiki blev oprettet succesfuldt" notification.article_deleted="Artikel slettet" notification.wiki_deleted="Wiki slettet" -notification.new_status_saved="To-Do-statusliste blev gemt succesfuldt" +notification.new_status_saved="To-do-statusliste blev gemt succesfuldt" notification.error_saving_status="Der opstod en fejl ved gemning af status." notification.at_least_one_status="Mindst én status skal oprettes." notification.error_installing="Der opstod en fejl ved installation af databasen. Tjek venligst fejloggen for flere oplysninger" @@ -427,19 +429,19 @@ links.all_times="Alle gange" links.book_hours="Book timer" links.forgot_password="Glemt adgangskode?" links.dont_do_it_alone="Gør det ikke alene! Tilføj flere brugere her!" -links.num_of_todos="# af To-Do's" +links.num_of_todos="# af to-do's" links.effort="Indsats" links.priority="Prioritet" links.hourly="Timeløn" links.create_sprint="Opret Sprint" -links.goto_backlog="Se alle To-Do's" +links.goto_backlog="Se alle to-do's" links.goto_milestones=" Begynd at planlægge din roadmap" -links.quick_add_todo="Hurtig tilføj To-Do" +links.quick_add_todo="Hurtig tilføj to-do" links.cancel="Annuller" -links.edit_todo="Rediger To-Do" +links.edit_todo="Rediger to-do" links.edit_canvas_item=" Rediger" links.delete_canvas_item=" Slet" -links.delete_todo="Slet To-Do" +links.delete_todo="Slet to-do" links.start_work="Start arbejde" links.stop_work_started_at="Stop arbejde, startede kl. %1$s" links.go_back="Gå tilbage" @@ -447,8 +449,8 @@ links.add_new_comment="Tilføj en ny kommentar" links.add_new_report="Opdater status" links.reply="Svar" links.delete="Slet" -links.add_todo=" Tilføj To-Do" -links.add_todo_no_icon="Tilføj To-Do" +links.add_todo=" Tilføj to-do" +links.add_todo_no_icon="Tilføj to-do" links.add_milestone=" Tilføj Milepæl" links.add_sprint=" Opret Sprint" links.filter=" Filtre" @@ -464,7 +466,7 @@ links.table=" Tabelvisning" links.gantt_view=" Gantt-visning" links.view="" links.group_by=" Gruppér efter" -links.all_todos="Alle To-Do's" +links.all_todos="Alle to-do's" links.create_idea_board=" Opret nyt board" links.edit_idea_board=" Rediger board" links.add_more=" Tilføj mere" @@ -472,7 +474,7 @@ links.create_attach_milestone="Opret og vedhæft en ny milepæl" links.attach_existing_milestone="Vedhæft en eksisterende milepæl" links.remove="Fjern" links.edit_milestone="Rediger Milepæl" -links.view_todos="Se To-Do's" +links.view_todos="Se to-do's" link.new_project="Nyt projekt" link.new_client="Ny klient" links.create_plan=" Opret nyt board" @@ -484,7 +486,7 @@ links.delete_sprint="Slet Sprint" links.new_with_icon=" Ny" links.my_timesheets="Mine tidsblade" links.dashboard="Instrumentbræt" -links.view_todo=" Se To-Do" +links.view_todo=" Se to-do" links.stop_timer=" Stop timer" links.back_to_login="Tilbage til login" links.download=" Download" @@ -530,7 +532,7 @@ menu.create_project=" Opret nyt projekt" menu.view_all_projects=" Se alle projekter" menu.view_all_clients=" Se alle kunder" menu.dashboard=" Projektoversigt" -menu.todos=" To-Do's" +menu.todos=" to-do's" menu.milestones=" Milepæle" menu.timesheets=" Tidsark" menu.all_timesheets=" Alle tidsark" @@ -672,7 +674,7 @@ labels.only_chose="Kun de brugere, jeg vælger under 'Team'" label.id="ID" label.due="Forfalden:" -label.due_todo="Forfalden To-Do: " +label.due_todo="Forfalden to-do: " label.planned_edit="Planlagt Redigering: " label.effort_not_clear="Anstrengelse ikke klart" label.priority_not_clear="Prioritet ikke klart" @@ -689,7 +691,7 @@ label.title="Titel" label.story="Historie" label.task="Opgave" label.bug="Fejl" -label.ticket_title="To-Do Navn" +label.ticket_title="To-do Navn" label.milestone="Milepæl" label.not_assigned_to_milestone="Ikke tildelt en milepæl" label.type="Type" @@ -728,22 +730,22 @@ label.budgets="Budgetter" label.hourly_budget="Budgettimer" label.budget_cost="Budgetomkostninger" label.project_name="Projektnavn" -label.num_tickets="Antal To-Dos" +label.num_tickets="Antal to-dos" label.employee="Medarbejder" label.all_employees="Alle medarbejdere" label.invoiced="Faktureret" label.invoiced_comp="MGR Godkendelse" label.no_results="Ingen resultater" -label.ticket="Billet" +label.ticket="Opgave" label.kind="Art" label.invoiced_emp="Faktureret medarbejder" label.paid="Betalt" -label.open_todos="Åbne To-Dos" +label.open_todos="Åbne to-dos" label.ideal="Ideal" label.project_done="Projekt færdig" -label.progress_todos="Igangværende To-Dos" -label.done_todos="Færdige To-Dos" -label.new_todos="Nye To-Dos" +label.progress_todos="Igangværende to-dos" +label.done_todos="Færdige to-dos" +label.new_todos="Nye to-dos" label.language="Sprog" label.profile_information="Profilinformation" label.invited="Inviteret" @@ -859,7 +861,7 @@ label.roles.clientManager="Klientchef" label.roles.manager="Firmaleder" label.roles.admin="Administrator" -label.roles.readonly="Læs kun" +label.roles.readonly="readonly" label.roles.commenter="Kommentator" label.roles.editor="Redaktør" label.roles.owner="Ejer" @@ -897,7 +899,7 @@ label.medium="Middel" label.weak="Svag" label.passwordRequirements="Adgangskoder skal være 8 tegn lange og indeholde 1 stort bogstav, 1 lille bogstav, 1 specialtegn og 1 numerisk tegn." -tabs.todosettings="Indstillinger for To-Do Status" +tabs.todosettings="Indstillinger for todo status" label.sortindex="Sorteringsposition" label.reportType="Rapporter som" label.showInKanban="Vis på Kanban Board" @@ -971,11 +973,11 @@ status.goal.miss="Mislykkes" box.goal="Mål" header.management="Virksomhedsstyring" -dropdown.how_big_todo="Hvor stor er denne To-Do?" +dropdown.how_big_todo="Hvor stor er denne opgave?" dropdown.select_priority="Hvad er prioriteringen af denne opgave?" dropdown.choose_milestone="Vælg en milepæl" dropdown.choose_status="Hvad er status?" -dropdown.choose_user="Tildelt til" +dropdown.choose_user="Tildel til" dropdown.not_assigned="Ikke tildelt" dropdown.choose_sprint="Vælg en sprint" @@ -1812,13 +1814,13 @@ label.priority_unkown="?" #version 2.3.6= text.use_milestone_to_track_leancanvas="Use a milestone to track work" -headline.move_todo="Flyt To-Do" +headline.move_todo="Flyt to-do" headline.move_milestone="Flyt Milepæl" -text.moving="To-Do'en ovenfor vil blive flyttet til et andet projekt. Husk, at sprint- og milepælinformation vil blive fjernet.
    Vælg venligst projektet:" +text.moving="To-do'en ovenfor vil blive flyttet til et andet projekt. Husk, at sprint- og milepælinformation vil blive fjernet.
    Vælg venligst projektet:" text.choose_project="Vælg venligst projektet" -text.moving_milestones="Dette vil flytte milepælen til et nyt projekt. Husk på, at dette vil inkludere alle To-Do's, der er forbundet med denne milepæl.
    Vælg venligst projektet:" +text.moving_milestones="Dette vil flytte milepælen til et nyt projekt. Husk på, at dette vil inkludere alle to-do's, der er forbundet med denne milepæl.
    Vælg venligst projektet:" buttons.move="Flyt" -links.move_todo="Flyt To-Do" +links.move_todo="Flyt to-do" links.move_milestone="Flyt Milepæl" text.ticket_moved="Flyttet succesfuldt" text.move_problem="Der opstod et problem ved flytning af dette element" @@ -1888,8 +1890,8 @@ popover.my_portfolio="Mit Portefølje" popover.notifications="Notifikationer" popover.home="Hjem" -headlines.pick_a_task="Vælg en To-Do" -text.edit_tasks_in_here="Vælg en To-Do til venstre for at redigere den lige her." +headlines.pick_a_task="Vælg en to-do" +text.edit_tasks_in_here="Vælg en to-do til venstre for at redigere den lige her." links.invite_user="Inviter Bruger" #2.3.14= @@ -1966,14 +1968,14 @@ templates.prd.problem_description="Link til Projektværdi Canvas (så problemkor #Leantime 2.3.16= headlines.connector="Leantime Forbindelse" -templates.todos="To-Do Skabeloner" +templates.todos="To-do Skabeloner" email_notifications.new_comment_todo_with_type_subject="Ny kommentar i %1$s [%2$s] - %3$s" email_notifications.new_comment_todo_with_type_message="%1$s tilføjede en ny kommentar til %2$s '%3$s': %4$s" #leantime 2.3.17= label.related_to="Relateret til" -label.not_related="Ikke relateret til nogen andre To-Dos" +label.not_related="Ikke relateret til nogen andre to-dos" buttons.reset_logo="Nulstil Logo" text.logo_reset="For at nulstille logoet til Leantime-logoet skal du klikke på knappen nedenfor" @@ -2000,7 +2002,7 @@ menu.create_project_tooltip=" Opret nyt Pr menu.view_all_projects_tooltip=" Se Alle Projekter" menu.view_all_clients_tooltip=" Se Alle Kunder" menu.dashboard_tooltip="Projekt Dashboard" -menu.todos_tooltip="To-Dos" +menu.todos_tooltip="To-dos" menu.milestones_tooltip="Milepæle" menu.timesheets_tooltip="Tidsblade" menu.all_timesheets_tooltip="Alle Tidsblade" @@ -2062,8 +2064,8 @@ label.defineTeam="Inviter dit Team" label.projectDescription="Beskriv dit projekt" label.createBlueprint="Definér dit projekt ved hjælp af en Blueprint" label.createMilestones="Opret milepæle og planlæg din tidsplan" -label.createTasks="Opret To-Dos" -label.finish80percent="Afslut 80% af dine To-Dos" +label.createTasks="Opret to-dos" +label.finish80percent="Afslut 80% af dine to-dos" label.contact_information="Kontaktinformation" label.employee_information="Medarbejderinformation" label.jobTitle="Jobtitel" @@ -2126,7 +2128,7 @@ links.calendar=" Kalender" links.create_sprint_no_icon="Opret Sprint" link.edit_sprint=" Rediger Sprint" label.sprintName="Sprint" -headlines.no_tickets="Kunne ikke finde nogen Milepæle eller To-Do's." +headlines.no_tickets="Kunne ikke finde nogen Milepæle eller to-do's." links.add_new_canvas_itemgoalcanvas=" Tilføj nyt mål" @@ -2257,8 +2259,8 @@ widgets.descriptions.welcome="The welcome widgets which gives you a quick overvi widgets.title.calendar="🗓️ Calendar" widgets.descriptions.calendar="The calendar widget allows you to manage your events and timebox your tasks. Just drag a task into the calendar." -widgets.title.my_todos="📥 My ToDos" -widgets.descriptions.my_todos="Your To-Dos grouped by date, project or goals." +widgets.title.my_todos="📥 Mine todos" +widgets.descriptions.my_todos="Your to-dos grouped by date, project or goals." headlines.widget_manager="Widget Manager" text.choose_widgets="Choose which widgets you would like to see on the dashboard." @@ -2372,7 +2374,7 @@ links.delete_list="Delete List" link.edit_list="Edit List" label.select_list="Select List" links.create_list_no_icon="Create New List" -links.no_list_todos="To-Dos not in a list" +links.no_list_todos="To-dos not in a list" links.no_list="Not in a list" label.list_name="List Name" @@ -2419,8 +2421,8 @@ label.why_is_this_important="Why is this important?" #3.0.8= text.ical_title="Leantime Calendar" -text.ical.todo_is_due="A Leantime To-Do is due soon." -text.ical.todo_start_alert="A Leantime To-Do is scheduled to be worked on soon" +text.ical.todo_is_due="A Leantime to-do is due soon." +text.ical.todo_start_alert="A Leantime to-do is scheduled to be worked on soon" #3.1.1= diff --git a/app/Language/de-CH.ini b/app/Language/de-CH.ini index e48cf1342c..eeb88d0311 100644 --- a/app/Language/de-CH.ini +++ b/app/Language/de-CH.ini @@ -181,6 +181,8 @@ notifications.file_upload_success = "Datei erfolgreich hochgeladen" notifications.file_upload_error = "Upload fehlgeschlagen" notifications.comment_create_success = "Kommentar erfolgreich erstellt" notifications.comment_create_error = "Kommentar konnte nicht erstellt werdenKommentar konnte nicht erstellt werden" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success = "Zeit erfolgreich erfasst." notifications.time_logged_error = "Es ist ein Problem bei der Zeiterfassung aufgetreten." notifications.time_logged_error_no_hours = "Die angegebene Stundenzahl muss grösser als 0 sein." diff --git a/app/Language/de-DE-inf.ini b/app/Language/de-DE-inf.ini index e3baa74745..cb49fe5399 100644 --- a/app/Language/de-DE-inf.ini +++ b/app/Language/de-DE-inf.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="Datei erfolgreich hochgeladen" notifications.file_upload_error="Upload fehlgeschlagen" notifications.comment_create_success="Kommentar erfolgreich erstellt" notifications.comment_create_error="Kommentar konnte nicht erstellt werdenKommentar konnte nicht erstellt werden" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Zeit erfolgreich erfasst." notifications.time_logged_error="Es ist ein Problem bei der Zeiterfassung aufgetreten." notifications.time_logged_error_no_hours="Die angegebene Stundenzahl muss größer als 0 sein." diff --git a/app/Language/de-DE.ini b/app/Language/de-DE.ini index 951a59bcea..ab13149d45 100644 --- a/app/Language/de-DE.ini +++ b/app/Language/de-DE.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="Datei erfolgreich hochgeladen" notifications.file_upload_error="Upload fehlgeschlagen" notifications.comment_create_success="Kommentar erfolgreich erstellt" notifications.comment_create_error="Kommentar konnte nicht erstellt werdenKommentar konnte nicht erstellt werden" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Zeit erfolgreich erfasst." notifications.time_logged_error="Es ist ein Problem bei der Zeiterfassung aufgetreten." notifications.time_logged_error_no_hours="Die angegebene Stundenzahl muss größer als 0 sein." diff --git a/app/Language/de-DE_informal.ini b/app/Language/de-DE_informal.ini index 89e3abb038..420151fcea 100644 --- a/app/Language/de-DE_informal.ini +++ b/app/Language/de-DE_informal.ini @@ -245,6 +245,8 @@ notifications.company_settings_edited_successfully = "Firmeneinstellungen erfolg notifications.sprint_deleted_successfully = "Sprint erfolgreich entfernt" notifications.comment_added_successfully = "Kommentar erfolgreich entfernt" notifications.problem_saving_your_comment = "Dein Kommentar konnte nicht gespeichert werden." +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.project_created_successfully = "Dein neues Projekt wurde erfolgreich erstellt. Setze deine Arbeit bei Forschung fort..." notifications.installation_success = "Die Installation war erfolgreich!

    Du kannst dich jetzt in deinem Workspace anmelden. Link:%1$s" notifications.installation_error = "Es ist etwas schief gelaufen
    %1$s

    Bitte entferne alle Leantime spezifischen Tabellen aus deiner Datenbank." diff --git a/app/Language/el-GR.ini b/app/Language/el-GR.ini index 2f90bb80e7..7dcfd6afd3 100644 --- a/app/Language/el-GR.ini +++ b/app/Language/el-GR.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Δεν ήταν δυνατή η αποστολ notifications.comment_create_success="Το σχόλιο δημιουργήθηκε επιτυχώς" notifications.comment_create_error="Το σχόλιο δεν μπορεί να προστεθεί" notifications.time_logged_success="Ο χρόνος καταγράφηκε επιτυχώς" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Παρουσιάστηκε ένα πρόβλημα κατά την καταγραφή του χρόνου σας" notifications.time_logged_error_no_hours="Παρακαλούμε προσθέστε περισσότερο από 0 ώρες" notifications.time_logged_error_no_date="Παρακαλώ προσθέστε μια ημερομηνία" diff --git a/app/Language/en-GB.ini b/app/Language/en-GB.ini index 97d9cc1b48..9cc14d0ba2 100644 --- a/app/Language/en-GB.ini +++ b/app/Language/en-GB.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/en-PT.ini b/app/Language/en-PT.ini index c42a66f87b..6c6479fd1c 100644 --- a/app/Language/en-PT.ini +++ b/app/Language/en-PT.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="File was uploaded successfully" notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" diff --git a/app/Language/en-UD.ini b/app/Language/en-UD.ini index cc97668cb6..88d0bf0794 100644 --- a/app/Language/en-UD.ini +++ b/app/Language/en-UD.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/en-US.ini b/app/Language/en-US.ini index eedb20107e..44a8c2364d 100644 --- a/app/Language/en-US.ini +++ b/app/Language/en-US.ini @@ -200,6 +200,8 @@ notifications.file_upload_error = "File could not be uploaded" notifications.comment_create_success = "Comment successfully created" notifications.comment_create_error = "Comment could not be added" notifications.time_logged_success = "Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error = "There was a problem logging your time" notifications.time_logged_error_no_hours = "Please add more than 0 hours" notifications.time_logged_error_no_date = "Please add a date" diff --git a/app/Language/es-419.ini b/app/Language/es-419.ini index cc97668cb6..88d0bf0794 100644 --- a/app/Language/es-419.ini +++ b/app/Language/es-419.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/es-ES.ini b/app/Language/es-ES.ini index 8cc4938f79..997b4c9606 100644 --- a/app/Language/es-ES.ini +++ b/app/Language/es-ES.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="No se pudo subir el archivo" notifications.comment_create_success="Comentario creado correctamente" notifications.comment_create_error="No se ha podido añadir el comentario" notifications.time_logged_success="Tiempo registrado correctamente" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Hubo un problema al registrar el tiempo" notifications.time_logged_error_no_hours="Por favor agrega un valor de tiempo > 0" notifications.time_logged_error_no_date="Por favor, agrega una fecha" diff --git a/app/Language/es-MX.ini b/app/Language/es-MX.ini index cc97668cb6..88d0bf0794 100644 --- a/app/Language/es-MX.ini +++ b/app/Language/es-MX.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/et-EE.ini b/app/Language/et-EE.ini index aab942b4ae..50a9464ec3 100644 --- a/app/Language/et-EE.ini +++ b/app/Language/et-EE.ini @@ -201,6 +201,8 @@ notifications.comment_create_success="Kommentaar on lisatud" notifications.comment_create_error="Kommentaari lisamine ebaõnnestus" notifications.time_logged_success="Aeg on logitud" notifications.time_logged_error="Sinu aja logimisel tekkis tõrge" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_hours="Palun lisa rohkem kui 0 tundi" notifications.time_logged_error_no_date="Palun lisa kuupäev" notifications.time_logged_error_no_kind="Palun lisa logitud aja liik" diff --git a/app/Language/fa-IR.ini b/app/Language/fa-IR.ini index 322bc3b337..417f4aa3f1 100644 --- a/app/Language/fa-IR.ini +++ b/app/Language/fa-IR.ini @@ -201,6 +201,8 @@ notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" notifications.time_logged_error_no_kind="Please add the type of time logged" diff --git a/app/Language/fr-CH.ini b/app/Language/fr-CH.ini index b008411e1b..41d9d63710 100644 --- a/app/Language/fr-CH.ini +++ b/app/Language/fr-CH.ini @@ -200,6 +200,8 @@ notifications.subtask_deleted = "Sous-tâche supprimée" notifications.subtask_delete_error = "Un problème est survenu lors de la suppression de la sous-tâche" notification.noProjects = "Vous n'avez aucun projet assigné. Demandez à un administrateur de vous assignez un projet." notification.noProjectsCreateNew = "Vous n'avez aucun projet assigné. Veuillez créer un nnouveau projet avant de démarrer" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notification.todo_deleted = "Tâche supprimée avec succès" notification.milestone_deleted = "Jalon supprimé avec succès" notification.saved_mattermost_webhook = "Webhook URL Mattermost sauvegardé avec succès" diff --git a/app/Language/fr-FR.ini b/app/Language/fr-FR.ini index 1bfaddfbe7..2997f502f3 100644 --- a/app/Language/fr-FR.ini +++ b/app/Language/fr-FR.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="le fichier n'a pas pu être chargé" notifications.comment_create_success="Commentaire créé avec succès" notifications.comment_create_error="Le commentaire n'a pas pu être crée" notifications.time_logged_success="Temps enregistré avec succès" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Il y a eu un problème pour enregistrer votre temps" notifications.time_logged_error_no_hours="Veuillez ajouter plus de 0 heures" notifications.time_logged_error_no_date="Veuillez ajouter une date" diff --git a/app/Language/he-IL.ini b/app/Language/he-IL.ini index 2d83d0833a..0f7217d069 100644 --- a/app/Language/he-IL.ini +++ b/app/Language/he-IL.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="לא ניתן להעלות קובץ" notifications.comment_create_success="התגובה נוצרה בהצלחה" notifications.comment_create_error="לא ניתן להוסיף תגובה" notifications.time_logged_success="הזמן תועד בהצלחה" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="אירעה שגיאה בתיעוד הזמן שלך" notifications.time_logged_error_no_hours="נא להוסיף יותר מ־0 שעות" notifications.time_logged_error_no_date="נא להוסיף תאריך" diff --git a/app/Language/hr-HR.ini b/app/Language/hr-HR.ini index d59d7233df..33e2b5ab7a 100644 --- a/app/Language/hr-HR.ini +++ b/app/Language/hr-HR.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/hu-HU.ini b/app/Language/hu-HU.ini index 3cc5030e23..145bf3566b 100644 --- a/app/Language/hu-HU.ini +++ b/app/Language/hu-HU.ini @@ -198,6 +198,8 @@ notifications.no_template="Nem található sablon" notifications.file_upload_success="A fájl feltöltése sikeres volt" notifications.file_upload_error="A fájlt nem sikerült feltölteni" notifications.comment_create_success="Megjegyzés sikeresen létrehozva" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.comment_create_error="Nem sikerült megjegyzést hozzáadni" notifications.time_logged_success="Az idő sikeresen naplózva" notifications.time_logged_error="Hiba történt az idő naplózásakor" diff --git a/app/Language/is-IS.ini b/app/Language/is-IS.ini index cc97668cb6..88d0bf0794 100644 --- a/app/Language/is-IS.ini +++ b/app/Language/is-IS.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/it-IT.ini b/app/Language/it-IT.ini index 75694850c5..8bbd641758 100644 --- a/app/Language/it-IT.ini +++ b/app/Language/it-IT.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Impossibile caricare il file" notifications.comment_create_success="Commento creato con successo" notifications.comment_create_error="Impossibile aggiungere il commento" notifications.time_logged_success="Tempo registrato correttamente" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Si e' verificato un problema durante la registrazione dell'ora" notifications.time_logged_error_no_hours="Si prega di aggiungere piu' di 0 ore" notifications.time_logged_error_no_date="Si prega di aggiungere una data" diff --git a/app/Language/ja-JA.ini b/app/Language/ja-JA.ini index edc75eeaf9..f7e95ac43c 100644 --- a/app/Language/ja-JA.ini +++ b/app/Language/ja-JA.ini @@ -204,6 +204,8 @@ notification.hypothesis_created = "仮説を作成しました" notifications.new_canvas_created = "新しい掲示板を作成しました" notification.idea_board_item_deleted = "アイデアを削除しました" notification.idea_board_deleted = "アイデア掲示板を削除しました" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notification.idea_board_created = "アイデア掲示板を作成しました" notification.idea_edited = "アイデアを編集しました" notification.idea_created = "アイデアを作成しました" diff --git a/app/Language/ja-JP.ini b/app/Language/ja-JP.ini index 01ea7f2f37..330225f564 100644 --- a/app/Language/ja-JP.ini +++ b/app/Language/ja-JP.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="ファイルをアップロードできませ notifications.comment_create_success="コメントを作成しました" notifications.comment_create_error="コメントを追加できませんでした" notifications.time_logged_success="作業時間を記録しました" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="作業時間の記録に失敗しました" notifications.time_logged_error_no_hours="0時間より大きい時間を追加してください" notifications.time_logged_error_no_date="日付を追加してください" diff --git a/app/Language/kaa.ini b/app/Language/kaa.ini index 62f93aa196..7218dbb4f7 100644 --- a/app/Language/kaa.ini +++ b/app/Language/kaa.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="File was uploaded successfully" notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" diff --git a/app/Language/km-KH.ini b/app/Language/km-KH.ini index 3b4ab91a11..dc64f1326e 100644 --- a/app/Language/km-KH.ini +++ b/app/Language/km-KH.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="ឯកសារមិនអាចផ្ទុ notifications.comment_create_success="មតិត្រូវបានបង្កើតដោយជោគជ័យ" notifications.comment_create_error="មិន​អាច​បន្ថែម​មតិ​បាន​ទេ" notifications.time_logged_success="ពេលវេលាត្រូវបានកត់ត្រាដោយជោគជ័យ" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="មានបញ្ហាក្នុងការកត់ត្រាពេលវេលារបស់អ្នក" notifications.time_logged_error_no_hours="សូមបន្ថែមលើសពី 0 ម៉ោង" notifications.time_logged_error_no_date="សូមបន្ថែមកាលបរិច្ឆេទ" diff --git a/app/Language/ko-KR.ini b/app/Language/ko-KR.ini index ceb7a35d28..99be38302c 100644 --- a/app/Language/ko-KR.ini +++ b/app/Language/ko-KR.ini @@ -201,6 +201,8 @@ notifications.comment_create_success="댓글이 성공적으로 작성되었습 notifications.comment_create_error="댓글을 추가할 수 없습니다" notifications.time_logged_success="시간이 성공적으로 기록되었습니다" notifications.time_logged_error="시간 기록 중 문제가 발생했습니다" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_hours="0 시간보다 더 많이 추가하십시오" notifications.time_logged_error_no_date="날짜를 추가하십시오" notifications.time_logged_error_no_kind="기록된 시간의 유형을 추가하십시오" diff --git a/app/Language/ks-IN.ini b/app/Language/ks-IN.ini index cc97668cb6..88d0bf0794 100644 --- a/app/Language/ks-IN.ini +++ b/app/Language/ks-IN.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/lv-LV.ini b/app/Language/lv-LV.ini index cc97668cb6..88d0bf0794 100644 --- a/app/Language/lv-LV.ini +++ b/app/Language/lv-LV.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/nl-NL.ini b/app/Language/nl-NL.ini index 849b286b26..28087fdefd 100644 --- a/app/Language/nl-NL.ini +++ b/app/Language/nl-NL.ini @@ -199,6 +199,8 @@ notifications.file_upload_success="Bestand met succes geüpload." notifications.file_upload_error="Bestand kon niet worden geüpload." notifications.comment_create_success="Reactie succesvol aangemaakt." notifications.comment_create_error="Reactie kon niet worden aangemaakt." +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_success="Tijd succesvol geregistreerd." notifications.time_logged_error="Er is een probleem opgetreden bij het registreren van de tijd." notifications.time_logged_error_no_hours="Voeg alsjeblieft een tijdwaarde > 0 toe." diff --git a/app/Language/no-NO.ini b/app/Language/no-NO.ini index ce8c8c49b0..137a1f8c0a 100644 --- a/app/Language/no-NO.ini +++ b/app/Language/no-NO.ini @@ -203,6 +203,8 @@ notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_kind="Please add the type of time logged" notifications.time_logged_error_no_ticket="Please add the to-do for the time logged" notifications.ticket_save_error_no_headline="Please enter a title for your To-Do" diff --git a/app/Language/pl-PL.ini b/app/Language/pl-PL.ini index 5c74894a2a..18cb0f5f77 100644 --- a/app/Language/pl-PL.ini +++ b/app/Language/pl-PL.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Plik nie mógł zostać przesłany" notifications.comment_create_success="Komentarz został pomyślnie utworzony" notifications.comment_create_error="Nie można dodać komentarza" notifications.time_logged_success="Czas został pomyślnie zalogowany" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Wystąpił problem z rejestrowaniem twojego czasu" notifications.time_logged_error_no_hours="Dodaj więcej niż 0 godzin" notifications.time_logged_error_no_date="Dodaj datę" diff --git a/app/Language/pt-BR.ini b/app/Language/pt-BR.ini index 0a80c38163..523c98828d 100644 --- a/app/Language/pt-BR.ini +++ b/app/Language/pt-BR.ini @@ -201,6 +201,8 @@ notifications.comment_create_success="Comentário criado com sucesso" notifications.comment_create_error="Não foi possível adicionar o Comentário" notifications.time_logged_success="Horas registradas com sucesso" notifications.time_logged_error="Houve um problema ao registrar suas horas" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_hours="Por favor adicione mais do que 0 horas" notifications.time_logged_error_no_date="Por favor adicione uma data" notifications.time_logged_error_no_kind="Por favor adicione de que tipo são as horas registradas" diff --git a/app/Language/pt-PT.ini b/app/Language/pt-PT.ini index d4e624a0eb..15a2d6ab33 100644 --- a/app/Language/pt-PT.ini +++ b/app/Language/pt-PT.ini @@ -201,6 +201,8 @@ notifications.comment_create_success="Comentário criado com sucesso" notifications.comment_create_error="Não foi possível adicionar o Comentário" notifications.time_logged_success="Horas registadas com sucesso" notifications.time_logged_error="Houve um problema ao registar suas horas" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_hours="Por favor adicione mais do que 0 horas" notifications.time_logged_error_no_date="Por favor adicione uma data" notifications.time_logged_error_no_kind="Por favor adicione de que tipo são as horas registadas" diff --git a/app/Language/ro-RO.ini b/app/Language/ro-RO.ini index cc97668cb6..77f427d9dc 100644 --- a/app/Language/ro-RO.ini +++ b/app/Language/ro-RO.ini @@ -202,6 +202,8 @@ notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_date="Please add a date" notifications.time_logged_error_no_kind="Please add the type of time logged" notifications.time_logged_error_no_ticket="Please add the to-do for the time logged" diff --git a/app/Language/ru-RU.ini b/app/Language/ru-RU.ini index 24eccfe530..5d584e4a78 100644 --- a/app/Language/ru-RU.ini +++ b/app/Language/ru-RU.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Файл не может быть загруж notifications.comment_create_success="Комментарий успешно сохранен" notifications.comment_create_error="Невозможно добавить комментарий" notifications.time_logged_success="Время успешно учтено" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="возникла проблема при учете времени" notifications.time_logged_error_no_hours="Пожалуйста, добавьте хотя бы один час" notifications.time_logged_error_no_date="Пожалуйста, добавьте дату" diff --git a/app/Language/sk-SK.ini b/app/Language/sk-SK.ini index 84af830ca7..b9a96da965 100644 --- a/app/Language/sk-SK.ini +++ b/app/Language/sk-SK.ini @@ -203,6 +203,8 @@ notifications.time_logged_success="Time logged successfully" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_kind="Please add the type of time logged" notifications.time_logged_error_no_ticket="Please add the to-do for the time logged" notifications.ticket_save_error_no_headline="Please enter a title for your To-Do" diff --git a/app/Language/sl-SI.ini b/app/Language/sl-SI.ini index 30ae4de9c8..6993625636 100644 --- a/app/Language/sl-SI.ini +++ b/app/Language/sl-SI.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Datoteke ni bilo mogoče naložiti" notifications.comment_create_success="Komentar je bil uspešno ustvarjen" notifications.comment_create_error="Komentarja ni bilo mogoče dodati" notifications.time_logged_success="Čas je bil uspešno zabeležen" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Pri beleženju vašega časa je prišlo do težave" notifications.time_logged_error_no_hours="Prosim, dodajte več kot 0 ur" notifications.time_logged_error_no_date="Prosim, dodajte datum" diff --git a/app/Language/sr-SP.ini b/app/Language/sr-SP.ini index c42a66f87b..cca9f22ec8 100644 --- a/app/Language/sr-SP.ini +++ b/app/Language/sr-SP.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="File could not be uploaded" notifications.comment_create_success="Comment successfully created" notifications.comment_create_error="Comment could not be added" notifications.time_logged_success="Time logged successfully" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="There was a problem logging your time" notifications.time_logged_error_no_hours="Please add more than 0 hours" notifications.time_logged_error_no_date="Please add a date" diff --git a/app/Language/sv-SE.ini b/app/Language/sv-SE.ini index 03eb6e98fd..32fb98c959 100644 --- a/app/Language/sv-SE.ini +++ b/app/Language/sv-SE.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Filen kunde inte laddas upp" notifications.comment_create_success="Kommentar har skapats" notifications.comment_create_error="Kommentar kunde inte läggas till" notifications.time_logged_success="Tiden har loggats" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Problem att logga din tid" notifications.time_logged_error_no_hours="Lägg till mer än 0 timmar" notifications.time_logged_error_no_date="Lägg till ett datum" diff --git a/app/Language/tr-TR.ini b/app/Language/tr-TR.ini index 82ba044eb1..6311487cb0 100644 --- a/app/Language/tr-TR.ini +++ b/app/Language/tr-TR.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Dosya yüklenemedi" notifications.comment_create_success="Yorum başarıyla oluşturuldu" notifications.comment_create_error="Yorum eklenemedi" notifications.time_logged_success="Zaman başarıyla kaydedildi" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Zamanınız kaydedilirken bir sorun oluştu" notifications.time_logged_error_no_hours="Lütfen 0 saatten fazla ekleyin" notifications.time_logged_error_no_date="Lütfen bir tarih ekleyin" diff --git a/app/Language/vi-VN.ini b/app/Language/vi-VN.ini index 60b8c6eb66..3a63d510db 100644 --- a/app/Language/vi-VN.ini +++ b/app/Language/vi-VN.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="Không thể tải lên tệp tin" notifications.comment_create_success="Bình luận đã được tạo thành công" notifications.comment_create_error="Không thể thêm bình luận" notifications.time_logged_success="Thời gian đã được ghi lại thành công" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="Có sự cố khi ghi lại thời gian của bạn" notifications.time_logged_error_no_hours="Vui lòng thêm hơn 0 giờ" notifications.time_logged_error_no_date="Vui lòng thêm ngày" diff --git a/app/Language/zh-CN.ini b/app/Language/zh-CN.ini index 30dffa3f71..a7f4d6dd40 100644 --- a/app/Language/zh-CN.ini +++ b/app/Language/zh-CN.ini @@ -201,6 +201,8 @@ notifications.comment_create_success="成功新增评论" notifications.comment_create_error="无法新增评论" notifications.time_logged_success="时间记录成功" notifications.time_logged_error="记录您的时间时出现问题" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error_no_hours="请输入超过0小时" notifications.time_logged_error_no_date="请输入日期" notifications.time_logged_error_no_kind="请输入记录的时间类型" diff --git a/app/Language/zh-TW.ini b/app/Language/zh-TW.ini index 2f0b1dcf1b..6e28f17e9e 100644 --- a/app/Language/zh-TW.ini +++ b/app/Language/zh-TW.ini @@ -200,6 +200,8 @@ notifications.file_upload_error="檔案無法上傳" notifications.comment_create_success="成功新增留言" notifications.comment_create_error="無法新增留言" notifications.time_logged_success="時間記錄成功" +notifications.comment_edited_success="Comment successfully edited" +notifications.comment_edit_error="Comment could not be edited" notifications.time_logged_error="記錄您的時間時出現問題" notifications.time_logged_error_no_hours="請輸入0小時以上的時間" notifications.time_logged_error_no_date="請輸入日期" diff --git a/public/assets/css/components/style.default.css b/public/assets/css/components/style.default.css index 5aa6b11369..c0f067a8fd 100644 --- a/public/assets/css/components/style.default.css +++ b/public/assets/css/components/style.default.css @@ -2209,6 +2209,11 @@ body .widgettitle .editHeadline:hover { margin-bottom:20px; } +.commentReply input[type="button"] { + margin-top:10px; + margin-bottom:20px; +} + .sortHandle { font-size:16px;