summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2017-02-08 19:12:16 -0500
committerFrederic Guillot <fred@kanboard.net>2017-02-08 19:12:16 -0500
commit58d4231f06fbcbc54573504af2c2a4561b9e89ed (patch)
tree828837dd98873c1e83aac9cdd7a9cd367ec899a3
parent73dce1279760434e1d1b7a903a0a7500462d6f9c (diff)
Improve columns table in project settings
-rw-r--r--app/Controller/ProjectOverviewController.php17
-rw-r--r--app/Controller/ProjectViewController.php5
-rw-r--r--app/Locale/bs_BA/translations.php6
-rw-r--r--app/Locale/cs_CZ/translations.php6
-rw-r--r--app/Locale/da_DK/translations.php6
-rw-r--r--app/Locale/de_DE/translations.php6
-rw-r--r--app/Locale/el_GR/translations.php6
-rw-r--r--app/Locale/es_ES/translations.php6
-rw-r--r--app/Locale/fi_FI/translations.php6
-rw-r--r--app/Locale/fr_FR/translations.php6
-rw-r--r--app/Locale/hu_HU/translations.php6
-rw-r--r--app/Locale/id_ID/translations.php6
-rw-r--r--app/Locale/it_IT/translations.php6
-rw-r--r--app/Locale/ja_JP/translations.php6
-rw-r--r--app/Locale/ko_KR/translations.php6
-rw-r--r--app/Locale/my_MY/translations.php6
-rw-r--r--app/Locale/nb_NO/translations.php6
-rw-r--r--app/Locale/nl_NL/translations.php6
-rw-r--r--app/Locale/pl_PL/translations.php6
-rw-r--r--app/Locale/pt_BR/translations.php6
-rw-r--r--app/Locale/pt_PT/translations.php6
-rw-r--r--app/Locale/ru_RU/translations.php6
-rw-r--r--app/Locale/sr_Latn_RS/translations.php6
-rw-r--r--app/Locale/sv_SE/translations.php6
-rw-r--r--app/Locale/th_TH/translations.php6
-rw-r--r--app/Locale/tr_TR/translations.php6
-rw-r--r--app/Locale/zh_CN/translations.php6
-rw-r--r--app/Model/BoardModel.php20
-rw-r--r--app/Model/ProjectModel.php34
-rw-r--r--app/Template/column/index.php6
-rw-r--r--app/Template/dashboard/projects.php2
-rw-r--r--app/Template/project_list/show.php2
-rw-r--r--app/Template/project_overview/columns.php4
-rw-r--r--app/Template/project_overview/show.php2
-rw-r--r--app/Template/project_user_overview/roles.php2
-rw-r--r--app/Template/project_view/show.php94
36 files changed, 69 insertions, 269 deletions
diff --git a/app/Controller/ProjectOverviewController.php b/app/Controller/ProjectOverviewController.php
index eb002936..33bec078 100644
--- a/app/Controller/ProjectOverviewController.php
+++ b/app/Controller/ProjectOverviewController.php
@@ -16,17 +16,18 @@ class ProjectOverviewController extends BaseController
public function show()
{
$project = $this->getProject();
- $this->projectModel->getColumnStats($project);
+ $columns = $this->columnModel->getAllWithTasksCount($project['id']);
$this->response->html($this->helper->layout->app('project_overview/show', array(
- 'project' => $project,
- 'title' => $project['name'],
+ 'project' => $project,
+ 'columns' => $columns,
+ 'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),
- 'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']),
- 'roles' => $this->projectRoleModel->getList($project['id']),
- 'events' => $this->helper->projectActivity->getProjectEvents($project['id'], 10),
- 'images' => $this->projectFileModel->getAllImages($project['id']),
- 'files' => $this->projectFileModel->getAllDocuments($project['id']),
+ 'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']),
+ 'roles' => $this->projectRoleModel->getList($project['id']),
+ 'events' => $this->helper->projectActivity->getProjectEvents($project['id'], 10),
+ 'images' => $this->projectFileModel->getAllImages($project['id']),
+ 'files' => $this->projectFileModel->getAllDocuments($project['id']),
)));
}
}
diff --git a/app/Controller/ProjectViewController.php b/app/Controller/ProjectViewController.php
index 92b93804..8ccf36ab 100644
--- a/app/Controller/ProjectViewController.php
+++ b/app/Controller/ProjectViewController.php
@@ -18,11 +18,12 @@ class ProjectViewController extends BaseController
public function show()
{
$project = $this->getProject();
+ $columns = $this->columnModel->getAllWithTasksCount($project['id']);
$this->response->html($this->helper->layout->project('project_view/show', array(
'project' => $project,
- 'stats' => $this->projectModel->getTaskStats($project['id']),
- 'title' => $project['name'],
+ 'columns' => $columns,
+ 'title' => $project['name'],
)));
}
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index ec94d427..f9a9e7d8 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Akcije',
'Inactive' => 'Neaktivan',
'Active' => 'Aktivan',
- '%d tasks on the board' => '%d zadataka na tabli',
- '%d tasks in total' => '%d zadataka ukupno',
'Unable to update this board.' => 'Nemogu da ažuriram ovu ploču.',
'Disable' => 'Onemogući',
'Enable' => 'Omogući',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Gotovo',
'Application version:' => 'Verzija aplikacije:',
'Id' => 'Id',
- '%d closed tasks' => '%d zatvorenih zadataka',
- 'No task for this project' => 'Nema dodijeljenih zadataka ovom projektu',
'Public link' => 'Javni link',
'Timezone' => 'Vremenska zona',
'Sorry, I didn\'t find this information in my database!' => 'Na žalost, nije pronađena informacija u bazi',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Kreiranje zadatka',
'Closing a task' => 'Zatvaranja zadatka',
'Assign a color to a specific user' => 'Dodeli boju korisniku',
- 'Column title' => 'Naslov kolone',
'Position' => 'Pozicija',
'Duplicate to another project' => 'Dupliciraj u drugi projekat',
'Duplicate' => 'Dupliciraj',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Želim obavještenja samo za ove projekte:',
'view the task on Kanboard' => 'Pregledaj zadatke',
'Public access' => 'Javni pristup',
- 'Active tasks' => 'Aktivni zadaci',
'Disable public access' => 'Zabrani javni pristup',
'Enable public access' => 'Dozvoli javni pristup',
'Public access disabled' => 'Javni pristup onemogućen!',
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index f7ebf88b..59f68325 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Akce',
'Inactive' => 'Neaktivní',
'Active' => 'Aktivní',
- '%d tasks on the board' => '%d úkolů na nástěnce',
- '%d tasks in total' => '%d úkolů celkem',
'Unable to update this board.' => 'Nástěnku není možné aktualizovat',
'Disable' => 'Zakázat projekt',
'Enable' => 'Povolit projekt',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Dokončeno',
'Application version:' => 'Verze:',
'Id' => 'ID',
- '%d closed tasks' => '%d dokončených úkolů',
- 'No task for this project' => 'Tento projekt nemá žádné úkoly',
'Public link' => 'Veřejný odkaz',
'Timezone' => 'Časová zóna',
'Sorry, I didn\'t find this information in my database!' => 'Omlouváme se, tuto informaci nelze nalézt!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Vytváření úkolu',
'Closing a task' => 'Uzavření úkolu',
'Assign a color to a specific user' => 'Přiřadit barvu konkrétnímu uživateli',
- 'Column title' => 'Název sloupce',
'Position' => 'Pozice',
'Duplicate to another project' => 'Vytvořit kopii v jiném projektu',
'Duplicate' => 'Vytvořit kopii',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Přeji si dostávat upozornění pouze pro následující projekty:',
'view the task on Kanboard' => 'Zobrazit úkol na Kanboard',
'Public access' => 'Veřejný přístup',
- 'Active tasks' => 'Aktivní úkoly',
'Disable public access' => 'Zakázat veřejný přístup',
'Enable public access' => 'Povolit veřejný přístup',
'Public access disabled' => 'Veřejný přístup zakázán',
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index d47505fd..e5d447a7 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Handlinger',
'Inactive' => 'Inaktiv',
'Active' => 'Aktiv',
- '%d tasks on the board' => '%d Opgaver på boardet',
- '%d tasks in total' => '%d Opgaver i alt',
'Unable to update this board.' => 'Ikke muligt at opdatere dette board',
'Disable' => 'Deaktiver',
'Enable' => 'Aktiver',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Færdig',
'Application version:' => 'Version:',
'Id' => 'ID',
- '%d closed tasks' => '%d lukket opgavet',
- 'No task for this project' => 'Ingen opgaver i dette projekt',
'Public link' => 'Offentligt link',
'Timezone' => 'Tidszone',
'Sorry, I didn\'t find this information in my database!' => 'Denne information kunne ikke findes i databasen!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Opgave oprettelse',
'Closing a task' => 'Lukke en opgave',
'Assign a color to a specific user' => 'Tildel en farve til en bestemt bruger',
- 'Column title' => 'Kolonne titel',
'Position' => 'Position',
'Duplicate to another project' => 'Kopier til et andet projekt',
'Duplicate' => 'Kopier',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Jeg vil kun have notifikationer for disse projekter:',
'view the task on Kanboard' => 'se opgaven på Kanboard',
'Public access' => 'Offentlig adgang',
- 'Active tasks' => 'Aktive opgaver',
'Disable public access' => 'Deaktiver offentlig adgang',
'Enable public access' => 'Aktivér offentlig adgang',
'Public access disabled' => 'Offentlig adgang deaktiveret',
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 33691161..6e7d0ed3 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Aktionen',
'Inactive' => 'Inaktiv',
'Active' => 'Aktiv',
- '%d tasks on the board' => '%d Aufgaben auf dieser Pinnwand',
- '%d tasks in total' => '%d Aufgaben insgesamt',
'Unable to update this board.' => 'Ändern dieser Pinnwand nicht möglich.',
'Disable' => 'Deaktivieren',
'Enable' => 'Aktivieren',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Erledigt',
'Application version:' => 'Version:',
'Id' => 'ID',
- '%d closed tasks' => '%d abgeschlossene Aufgaben',
- 'No task for this project' => 'Keine Aufgaben in diesem Projekt',
'Public link' => 'Öffentlicher Link',
'Timezone' => 'Zeitzone',
'Sorry, I didn\'t find this information in my database!' => 'Diese Information wurde in der Datenbank nicht gefunden!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Aufgabe erstellen',
'Closing a task' => 'Aufgabe abschließen',
'Assign a color to a specific user' => 'Einem Benutzer eine Farbe zuordnen',
- 'Column title' => 'Spaltentitel',
'Position' => 'Position',
'Duplicate to another project' => 'In ein anderes Projekt duplizieren',
'Duplicate' => 'Duplizieren',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Ich möchte nur für diese Projekte Benachrichtigungen erhalten:',
'view the task on Kanboard' => 'diese Aufgabe auf dem Kanboard zeigen',
'Public access' => 'Öffentlicher Zugriff',
- 'Active tasks' => 'Aktive Aufgaben',
'Disable public access' => 'Öffentlichen Zugriff deaktivieren',
'Enable public access' => 'Öffentlichen Zugriff aktivieren',
'Public access disabled' => 'Öffentlicher Zugriff deaktiviert',
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 182f69b7..e76175fb 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Ενέργειες',
'Inactive' => 'Ανενεργός',
'Active' => 'Ενεργός',
- '%d tasks on the board' => '%d εργασίες στον κεντρικό πίνακα έργου',
- '%d tasks in total' => '%d εργασιών στο σύνολο',
'Unable to update this board.' => 'Αδύνατη η ενημέρωση αυτού του πίνακα',
'Disable' => 'Απενεργοποίηση',
'Enable' => 'Ενεργοποίηση',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Ολοκληρωμένα',
'Application version:' => 'Version εφαρμογής :',
'Id' => 'Αναγνωριστικό.',
- '%d closed tasks' => '%d κλειστές εργασίες',
- 'No task for this project' => 'Αριθμός εργασιών για το έργο',
'Public link' => 'Δημόσιος σύνδεσμος',
'Timezone' => 'Timezone',
'Sorry, I didn\'t find this information in my database!' => 'Δυστυχώς δεν βρέθηκε αυτή η πληροφορία στη βάση δεδομένων',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Δημιουργία εργασίας',
'Closing a task' => 'Κλείσιμο εργασίας',
'Assign a color to a specific user' => 'Ανάθεση χρώματος σε συγκεκριμένο χρήστη',
- 'Column title' => 'Τίτλος στήλης',
'Position' => 'Θέση',
'Duplicate to another project' => 'Αντιγραφή σε άλλο έργο',
'Duplicate' => 'Αντιγραφή',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Θέλω να ενημερώνομαι αποκλειστικά για:',
'view the task on Kanboard' => 'Προβολή της εργασίας στο Kanboard',
'Public access' => 'Ανοιχτή πρόσβαση',
- 'Active tasks' => 'Ενεργοποιημένες εργασίες',
'Disable public access' => 'Απενεργοποίηση δημόσιας πρόσβασης',
'Enable public access' => 'Ενεργοποίηση δημόσιας πρόσβασης',
'Public access disabled' => 'Δημόσια πρόσβαση απενεργοποιήθηκε',
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 4a0e8f47..e788b98a 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Acciones',
'Inactive' => 'Inactivo',
'Active' => 'Activo',
- '%d tasks on the board' => '%d tareas en el tablero',
- '%d tasks in total' => '%d tareas en total',
'Unable to update this board.' => 'No se puede actualizar este tablero.',
'Disable' => 'Desactivar',
'Enable' => 'Activar',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Hecho',
'Application version:' => 'Versión de la aplicación:',
'Id' => 'Identificador',
- '%d closed tasks' => '%d tareas completadas',
- 'No task for this project' => 'Ninguna tarea para este proyecto',
'Public link' => 'Enlace público',
'Timezone' => 'Zona horaria',
'Sorry, I didn\'t find this information in my database!' => '¡Lo siento, no he encontrado esta información en mi base de datos!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Creación de una tarea',
'Closing a task' => 'Cerrar una tarea',
'Assign a color to a specific user' => 'Asignar un color a un usuario específico',
- 'Column title' => 'Título de la columna',
'Position' => 'Posición',
'Duplicate to another project' => 'Duplicar a otro proyecto',
'Duplicate' => 'Duplicar',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Quiero recibir notificaciones sólo de estos proyectos:',
'view the task on Kanboard' => 'ver la tarea en Kanboard',
'Public access' => 'Acceso público',
- 'Active tasks' => 'Tareas activas',
'Disable public access' => 'Desactivar acceso público',
'Enable public access' => 'Activar acceso público',
'Public access disabled' => 'Acceso público desactivado',
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 30f40cee..3fb6bf29 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Toiminnot',
'Inactive' => 'Ei aktiivinen',
'Active' => 'Aktiivinen',
- '%d tasks on the board' => '%d tehtävää taululla',
- '%d tasks in total' => '%d tehtävää yhteensä',
'Unable to update this board.' => 'Taulun muuttaminen ei onnistunut.',
'Disable' => 'Disabloi',
'Enable' => 'Aktivoi',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Tehty',
'Application version:' => 'Ohjelman versio:',
'Id' => 'Id',
- '%d closed tasks' => '%d suljettua tehtävää',
- 'No task for this project' => 'Ei tehtävää tälle projektille',
'Public link' => 'Julkinen linkki',
'Timezone' => 'Aikavyöhyke',
'Sorry, I didn\'t find this information in my database!' => 'Anteeksi, en löytänyt tätä tietoa tietokannastani',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Tehtävän luominen',
'Closing a task' => 'Tehtävää suljetaan',
'Assign a color to a specific user' => 'Valitse väri käyttäjälle',
- 'Column title' => 'Sarakkeen nimi',
'Position' => 'Positio',
'Duplicate to another project' => 'Kopioi toiseen projektiin',
'Duplicate' => 'Monista',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Haluan vastaanottaa ilmoituksia ainoastaan näistä projekteista:',
'view the task on Kanboard' => 'katso tehtävää Kanboardissa',
'Public access' => 'Julkinen käyttöoikeus',
- 'Active tasks' => 'Aktiiviset tehtävät',
'Disable public access' => 'Poista käytöstä julkinen käyttöoikeus',
'Enable public access' => 'Ota käyttöön ',
'Public access disabled' => 'Julkinen käyttöoikeus ei ole käytössä',
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 5c1187f9..4a34d32a 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Actions',
'Inactive' => 'Inactif',
'Active' => 'Actif',
- '%d tasks on the board' => '%d tâches sur le tableau',
- '%d tasks in total' => '%d tâches au total',
'Unable to update this board.' => 'Impossible de mettre à jour ce tableau.',
'Disable' => 'Désactiver',
'Enable' => 'Activer',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Terminé',
'Application version:' => 'Version de l\'application :',
'Id' => 'Id.',
- '%d closed tasks' => '%d tâches terminées',
- 'No task for this project' => 'Aucune tâche pour ce projet',
'Public link' => 'Lien public',
'Timezone' => 'Fuseau horaire',
'Sorry, I didn\'t find this information in my database!' => 'Désolé, je n\'ai pas trouvé cette information dans ma base de données !',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Création d\'une tâche',
'Closing a task' => 'Fermeture d\'une tâche',
'Assign a color to a specific user' => 'Assigner une couleur à un utilisateur',
- 'Column title' => 'Titre de la colonne',
'Position' => 'Position',
'Duplicate to another project' => 'Dupliquer dans un autre projet',
'Duplicate' => 'Dupliquer',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Je souhaite reçevoir les notifications uniquement pour les projets sélectionnés :',
'view the task on Kanboard' => 'voir la tâche sur Kanboard',
'Public access' => 'Accès public',
- 'Active tasks' => 'Tâches actives',
'Disable public access' => 'Désactiver l\'accès public',
'Enable public access' => 'Activer l\'accès public',
'Public access disabled' => 'Accès public désactivé',
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 2c7c59d4..bd2a1f6e 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Műveletek',
'Inactive' => 'Inaktív',
'Active' => 'Aktív',
- '%d tasks on the board' => '%d feladat a táblán',
- '%d tasks in total' => 'Összesen %d feladat',
'Unable to update this board.' => 'Nem lehet frissíteni a táblát.',
'Disable' => 'Letiltás',
'Enable' => 'Engedélyezés',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Kész',
'Application version:' => 'Alkalmazás verzió:',
'Id' => 'ID',
- '%d closed tasks' => '%d lezárt feladat',
- 'No task for this project' => 'Nincs feladat ebben a projektben',
'Public link' => 'Nyilvános hivatkozás',
'Timezone' => 'Időzóna',
'Sorry, I didn\'t find this information in my database!' => 'Ez az információ nem található az adatbázisban!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Feladat létrehozása',
'Closing a task' => 'Feladat lezárása',
'Assign a color to a specific user' => 'Szín hozzárendelése a felhasználóhoz',
- 'Column title' => 'Oszlopfejléc',
'Position' => 'Pozíció',
'Duplicate to another project' => 'Másolás másik projektbe',
'Duplicate' => 'Másolás',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Csak ezekről a projektekről kérek értesítést:',
'view the task on Kanboard' => 'feladat megtekintése a Kanboardon',
'Public access' => 'Nyilvános hozzáférés',
- 'Active tasks' => 'Aktív feladatok',
'Disable public access' => 'Nyilvános hozzáférés letiltása',
'Enable public access' => 'Nyilvános hozzáférés engedélyezése',
'Public access disabled' => 'Nyilvános hozzáférés letiltva',
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index b7a73e20..14ff1e02 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Tindakan',
'Inactive' => 'Non Aktif',
'Active' => 'Aktif',
- '%d tasks on the board' => '%d tugas di papan',
- '%d tasks in total' => '%d tugas di total',
'Unable to update this board.' => 'Tidak dapat memperbarui papan ini',
'Disable' => 'Nonaktifkan',
'Enable' => 'Aktifkan',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Selesai',
'Application version:' => 'Versi aplikasi:',
'Id' => 'ID',
- '%d closed tasks' => '%d tugas yang ditutup',
- 'No task for this project' => 'Tidak ada tugas dalam proyek ini',
'Public link' => 'Tautan publik',
'Timezone' => 'Zona waktu',
'Sorry, I didn\'t find this information in my database!' => 'Maaf, saya tidak dapat menemukan informasi ini dalam database saya!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Membuat tugas',
'Closing a task' => 'Menutup tugas',
'Assign a color to a specific user' => 'Menetapkan warna untuk pengguna tertentu',
- 'Column title' => 'Judul kolom',
'Position' => 'Posisi',
'Duplicate to another project' => 'Duplikasi ke proyek lain',
'Duplicate' => 'Duplikat',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Saya ingin menerima pemberitahuan hanya untuk proyek-proyek yang dipilih :',
'view the task on Kanboard' => 'lihat tugas di Kanboard',
'Public access' => 'Akses publik',
- 'Active tasks' => 'Tugas aktif',
'Disable public access' => 'Nonaktifkan akses publik',
'Enable public access' => 'Aktifkan akses publik',
'Public access disabled' => 'Akses publik dinonaktifkan',
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 85ad4a8a..eaff4d6e 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Azioni',
'Inactive' => 'Inattivo',
'Active' => 'Attivo',
- '%d tasks on the board' => '%d task sulla bacheca',
- '%d tasks in total' => '%d task in totale',
'Unable to update this board.' => 'Impossibile aggiornare questa bacheca.',
'Disable' => 'Disattiva',
'Enable' => 'Attiva',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Fatto',
'Application version:' => 'Versione dell\'applicazione:',
// 'Id' => '',
- '%d closed tasks' => '%d task chiusi',
- 'No task for this project' => 'Nessun task per questo progetto',
'Public link' => 'Link pubblico',
'Timezone' => 'Fuso orario',
'Sorry, I didn\'t find this information in my database!' => 'Spiacente, non ho trovato questa informazione sul database!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Creazione di un task',
'Closing a task' => 'Chiusura di un task',
'Assign a color to a specific user' => 'Assegna un colore ad un utente specifico',
- 'Column title' => 'Titolo della colonna',
'Position' => 'Posizione',
'Duplicate to another project' => 'Duplica in un altro progetto',
'Duplicate' => 'Duplica',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Vorrei ricevere le notifiche solo da questi progetti:',
'view the task on Kanboard' => 'visualizza il task su Kanboard',
'Public access' => 'Accesso pubblico',
- 'Active tasks' => 'Task attivi',
'Disable public access' => 'Disabilita l\'accesso pubblico',
'Enable public access' => 'Abilita l\'accesso pubblico',
'Public access disabled' => 'Accesso pubblico disattivato',
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 867a7644..58375e47 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'アクション',
'Inactive' => '無効',
'Active' => '有効',
- '%d tasks on the board' => '%d 個のタスク',
- '%d tasks in total' => '合計 %d 個のタスク',
'Unable to update this board.' => 'ボードを更新できませんでした',
'Disable' => '無効にする',
'Enable' => '有効にする',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Done',
'Application version:' => 'アプリケーションのバージョン:',
'Id' => 'ID',
- '%d closed tasks' => '%d 個のクローズしたタスク',
- 'No task for this project' => 'このプロジェクトにタスクがありません',
'Public link' => '公開アクセス用リンク',
'Timezone' => 'タイムゾーン',
'Sorry, I didn\'t find this information in my database!' => 'データベース上で情報が見つかりませんでした!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'タスクを作る',
'Closing a task' => 'タスクをクローズする',
'Assign a color to a specific user' => '色をユーザに割り当てる',
- 'Column title' => 'カラムのタイトル',
'Position' => '位置',
'Duplicate to another project' => '別のプロジェクトに複製する',
'Duplicate' => '複製する',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => '以下のプロジェクトにのみ通知を受け取る:',
'view the task on Kanboard' => 'Kanboard でタスクを見る',
'Public access' => '公開アクセス設定',
- 'Active tasks' => 'アクティブなタスク',
'Disable public access' => '公開アクセスを無効にする',
'Enable public access' => '公開アクセスを有効にする',
'Public access disabled' => '公開アクセスは無効化されています',
diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php
index 8b2c421b..d327f978 100644
--- a/app/Locale/ko_KR/translations.php
+++ b/app/Locale/ko_KR/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Actions',
'Inactive' => '무효',
'Active' => '유효',
- '%d tasks on the board' => '%d개의 할일',
- '%d tasks in total' => '총 %d개의 할일',
'Unable to update this board.' => '보드를 갱신할 수 없었습니다',
'Disable' => '비활성화',
'Enable' => '유효하게 한다',
@@ -146,8 +144,6 @@ return array(
'Done' => '완료',
'Application version:' => '애플리케이션의 버전:',
'Id' => 'ID',
- '%d closed tasks' => '%d개의 마친 할일',
- 'No task for this project' => '이 프로젝트에 할일이 없습니다',
'Public link' => '공개 접속 링크',
'Timezone' => '시간대',
'Sorry, I didn\'t find this information in my database!' => '데이터베이스에서 정보가 발견되지 않았습니다!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => '할일을 만들',
'Closing a task' => '할일을 닫혔다',
'Assign a color to a specific user' => '색을 사용자에 할당',
- 'Column title' => '컬럼의 제목',
'Position' => '위치',
'Duplicate to another project' => '다른 프로젝트에 복사',
'Duplicate' => '복사',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => '다음 프로젝트의 알림만 받겠습니다:',
'view the task on Kanboard' => 'Kanboard에서 할일을 본다',
'Public access' => '공개 접속 설정',
- 'Active tasks' => '활성화된 할일',
'Disable public access' => '공개 접속 비활성화',
'Enable public access' => '공개 접속 활성화',
'Public access disabled' => '공개 접속 불가',
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index 417d9510..01cd05b9 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Tindakan',
'Inactive' => 'Tidak Aktif',
'Active' => 'Aktif',
- '%d tasks on the board' => '%d tugasan di papan',
- '%d tasks in total' => 'Sejumlah %d tugasan',
'Unable to update this board.' => 'Tidak berupaya mengemaskini papan ini',
'Disable' => 'Nyah-Upaya',
'Enable' => 'Aktifkan',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Selesai',
'Application version:' => 'Versi aplikasi :',
'Id' => 'Id.',
- '%d closed tasks' => '%d tugas yang ditutup',
- 'No task for this project' => 'Tidak ada tugas dalam projek ini',
'Public link' => 'Pautan publik',
'Timezone' => 'Zona waktu',
'Sorry, I didn\'t find this information in my database!' => 'Maaf, saya tidak menemukan informasi ini dalam basis data saya !',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Membuat tugas',
'Closing a task' => 'Menutup tugas',
'Assign a color to a specific user' => 'Menetapkan warna untuk pengguna tertentu',
- 'Column title' => 'Judul kolom',
'Position' => 'Posisi',
'Duplicate to another project' => 'Duplikasi ke projek lain',
'Duplicate' => 'Duplikasi',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Saya ingin menerima pemberitahuan hanya untuk projek-projek yang dipilih :',
'view the task on Kanboard' => 'lihat tugas di Kanboard',
'Public access' => 'Akses awam',
- 'Active tasks' => 'Tugas aktif',
'Disable public access' => 'Nyahaktifkan akses awam',
'Enable public access' => 'Aktifkan akses awam',
'Public access disabled' => 'Akses awam dinyahaktif',
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index 8d0baaa7..d68545c2 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Handlinger',
'Inactive' => 'Inaktiv',
'Active' => 'Aktiv',
- '%d tasks on the board' => '%d Oppgaver på hovedsiden',
- '%d tasks in total' => '%d Oppgaver i alt',
'Unable to update this board.' => 'Ikke mulig at oppdatere hovedsiden',
'Disable' => 'Deaktiver',
'Enable' => 'Aktiver',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Utført',
'Application version:' => 'Versjon:',
'Id' => 'ID',
- '%d closed tasks' => '%d lukkede oppgaver',
- 'No task for this project' => 'Ingen oppgaver i dette prosjektet',
'Public link' => 'Offentligt lenke',
'Timezone' => 'Tidssone',
'Sorry, I didn\'t find this information in my database!' => 'Denne informasjonen kunne ikke finnes i databasen!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Oppgaveoprettelse',
'Closing a task' => 'Lukke en oppgave',
'Assign a color to a specific user' => 'Tildel en farge til en bestemt bruker',
- 'Column title' => 'Kolonne tittel',
'Position' => 'Posisjon',
'Duplicate to another project' => 'Kopier til et annet prosjekt',
'Duplicate' => 'Kopier',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Jeg vil kun ha varslinger for disse prosjekter:',
'view the task on Kanboard' => 'se oppgaven påhovedsiden',
'Public access' => 'Offentlig tilgang',
- 'Active tasks' => 'Aktive oppgaver',
'Disable public access' => 'Deaktiver offentlig tilgang',
'Enable public access' => 'Aktiver offentlig tilgang',
'Public access disabled' => 'Offentlig tilgang er deaktivert',
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index cfdb26d3..a338be3e 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Acties',
'Inactive' => 'Inactief',
'Active' => 'Actief',
- '%d tasks on the board' => '%d taken op het bord',
- '%d tasks in total' => '%d taken in totaal',
'Unable to update this board.' => 'Update van dit bord niet mogelijk.',
'Disable' => 'Deactiveren',
'Enable' => 'Activeren',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Afgewerkt',
'Application version:' => 'Applicatie versie :',
'Id' => 'Id',
- '%d closed tasks' => '%d gesloten taken',
- 'No task for this project' => 'Geen taken voor dit project',
'Public link' => 'Publieke link',
'Timezone' => 'Tijdzone',
'Sorry, I didn\'t find this information in my database!' => 'Sorry deze informatie kon niet worden gevonden in de database !',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Taak aanmaken',
'Closing a task' => 'Taak sluiten',
'Assign a color to a specific user' => 'Wijs een kleur toe aan een gebruiker',
- 'Column title' => 'Kolom titel',
'Position' => 'Positie',
'Duplicate to another project' => 'Dupliceren in een ander project',
'Duplicate' => 'Dupliceren',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Ik wil notificaties ontvangen van de volgende projecten :',
'view the task on Kanboard' => 'taak bekijken op Kanboard',
'Public access' => 'Publieke toegang',
- 'Active tasks' => 'Actieve taken',
'Disable public access' => 'Publieke toegang uitschakelen',
'Enable public access' => 'Publieke toegang inschakelen',
'Public access disabled' => 'Publieke toegang uitgeschakeld',
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 245c6df1..3b753633 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Akcje',
'Inactive' => 'Nieaktywny',
'Active' => 'Aktywny',
- '%d tasks on the board' => '%d zadań na tablicy',
- '%d tasks in total' => '%d wszystkich zadań',
'Unable to update this board.' => 'Nie można zaktualizować tablicy.',
'Disable' => 'Wyłącz',
'Enable' => 'Włącz',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Zakończone',
'Application version:' => 'Wersja aplikacji:',
'Id' => 'Id',
- '%d closed tasks' => '%d zamkniętych zadań',
- 'No task for this project' => 'Brak zadań dla tego projektu',
'Public link' => 'Link publiczny',
'Timezone' => 'Strefa czasowa',
'Sorry, I didn\'t find this information in my database!' => 'Niestety nie znaleziono tej informacji w bazie danych',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Tworzenie zadania',
'Closing a task' => 'Zamknięcie zadania',
'Assign a color to a specific user' => 'Przypisz kolor do wybranego użytkownika',
- 'Column title' => 'Tytuł kolumny',
'Position' => 'Pozycja',
'Duplicate to another project' => 'Skopiuj do innego projektu',
'Duplicate' => 'Utwórz kopię',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Chcę otrzymywać powiadomienia tylko dla poniższych projektów:',
'view the task on Kanboard' => 'Zobacz zadanie',
'Public access' => 'Dostęp publiczny',
- 'Active tasks' => 'Aktywne zadania',
'Disable public access' => 'Zablokuj dostęp publiczny',
'Enable public access' => 'Odblokuj dostęp publiczny',
'Public access disabled' => 'Dostęp publiczny zablokowany',
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 14e19d44..38eac473 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Ações',
'Inactive' => 'Inativo',
'Active' => 'Ativo',
- '%d tasks on the board' => '%d tarefas no board',
- '%d tasks in total' => '%d tarefas no total',
'Unable to update this board.' => 'Não foi possível atualizar este board.',
'Disable' => 'Desativar',
'Enable' => 'Ativar',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Feito',
'Application version:' => 'Versão da aplicação:',
'Id' => 'Id',
- '%d closed tasks' => '%d tarefas finalizadas',
- 'No task for this project' => 'Não há tarefa para este projeto',
'Public link' => 'Link público',
'Timezone' => 'Fuso horário',
'Sorry, I didn\'t find this information in my database!' => 'Desculpe, não encontrei esta informação no meu banco de dados!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Criação de tarefa',
'Closing a task' => 'Finalizando uma tarefa',
'Assign a color to a specific user' => 'Designar uma cor para um usuário específico',
- 'Column title' => 'Título da coluna',
'Position' => 'Posição',
'Duplicate to another project' => 'Duplicar para outro projeto',
'Duplicate' => 'Duplicar',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Quero receber notificações apenas destes projetos:',
'view the task on Kanboard' => 'ver a tarefa no Kanboard',
'Public access' => 'Acesso público',
- 'Active tasks' => 'Tarefas ativas',
'Disable public access' => 'Desabilitar o acesso público',
'Enable public access' => 'Habilitar o acesso público',
'Public access disabled' => 'Acesso público desabilitado',
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 760bafaa..ca23a662 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Acções',
'Inactive' => 'Inactivo',
'Active' => 'Activo',
- '%d tasks on the board' => '%d tarefas no quadro',
- '%d tasks in total' => '%d tarefas no total',
'Unable to update this board.' => 'Não foi possível actualizar este quadro.',
'Disable' => 'Desactivar',
'Enable' => 'Activar',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Finalizado',
'Application version:' => 'Versão da aplicação:',
'Id' => 'Id',
- '%d closed tasks' => '%d tarefas finalizadas',
- 'No task for this project' => 'Não há tarefa para este projeto',
'Public link' => 'Link público',
'Timezone' => 'Fuso horário',
'Sorry, I didn\'t find this information in my database!' => 'Desculpe, não encontrei esta informação na minha base de dados!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Criação de tarefa',
'Closing a task' => 'A finalizar uma tarefa',
'Assign a color to a specific user' => 'Designar uma cor para um utilizador específico',
- 'Column title' => 'Título da coluna',
'Position' => 'Posição',
'Duplicate to another project' => 'Duplicar para outro projeto',
'Duplicate' => 'Duplicar',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Quero receber notificações apenas destes projetos:',
'view the task on Kanboard' => 'ver a tarefa no Kanboard',
'Public access' => 'Acesso público',
- 'Active tasks' => 'Tarefas activas',
'Disable public access' => 'Desactivar o acesso público',
'Enable public access' => 'Activar o acesso público',
'Public access disabled' => 'Acesso público desactivado',
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index ca2b4f60..8cd10d87 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Действия',
'Inactive' => 'Неактивен',
'Active' => 'Активен',
- '%d tasks on the board' => '%d задач на доске',
- '%d tasks in total' => 'всего %d задач',
'Unable to update this board.' => 'Не удалось обновить эту доску.',
'Disable' => 'Выключить проект',
'Enable' => 'Включить проект',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Выполнено',
'Application version:' => 'Версия приложения:',
'Id' => 'ID',
- '%d closed tasks' => '%d завершённых задач',
- 'No task for this project' => 'Нет задач для этого проекта',
'Public link' => 'Ссылка для просмотра',
'Timezone' => 'Часовой пояс',
'Sorry, I didn\'t find this information in my database!' => 'К сожалению, информация в базе данных не найдена!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Создание задачи',
'Closing a task' => 'Завершение задачи',
'Assign a color to a specific user' => 'Назначить определённый цвет пользователю',
- 'Column title' => 'Название колонки',
'Position' => 'Расположение',
'Duplicate to another project' => 'Клонировать в другой проект',
'Duplicate' => 'Клонировать',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Я хочу получать уведомления только по этим проектам:',
'view the task on Kanboard' => 'посмотреть задачу на Kanboard',
'Public access' => 'Общий доступ',
- 'Active tasks' => 'Активные задачи',
'Disable public access' => 'Отключить общий доступ',
'Enable public access' => 'Включить общий доступ',
'Public access disabled' => 'Общий доступ отключён',
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 9438293f..bc342d05 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Akcje',
'Inactive' => 'Neaktivan',
'Active' => 'Aktivan',
- '%d tasks on the board' => '%d zadataka na tabli',
- '%d tasks in total' => '%d zadataka ukupno',
'Unable to update this board.' => 'Nemogu da ažuriram ovu tablu.',
'Disable' => 'Onemogući',
'Enable' => 'Omogući',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Gotovo',
'Application version:' => 'Verzija aplikacije:',
'Id' => 'Id',
- '%d closed tasks' => '%d zatvorenih zadataka',
- 'No task for this project' => 'Nema dodeljenih zadataka ovom projektu',
'Public link' => 'Javni link',
'Timezone' => 'Vremenska zona',
'Sorry, I didn\'t find this information in my database!' => 'Na žalost, nije pronađena informacija u bazi',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Kreiranje zadatka',
'Closing a task' => 'Zatvaranja zadatka',
'Assign a color to a specific user' => 'Dodeli boju korisniku',
- 'Column title' => 'Naslov kolone',
'Position' => 'Pozicija',
'Duplicate to another project' => 'Kopiraj u drugi projekat',
'Duplicate' => 'Napravi kopiju',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Želim obaveštenja samo za ovaj projekat:',
'view the task on Kanboard' => 'Pregledaj zadatke',
'Public access' => 'Javni pristup',
- 'Active tasks' => 'Aktivni zadaci',
'Disable public access' => 'Zabrani javni pristup',
'Enable public access' => 'Dozvoli javni pristup',
'Public access disabled' => 'Javni pristup onemogućen!',
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 51979ff8..00e42412 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'Åtgärder',
'Inactive' => 'Inaktiv',
'Active' => 'Aktiv',
- '%d tasks on the board' => '%d uppgifter på tavlan',
- '%d tasks in total' => '%d uppgifter totalt',
'Unable to update this board.' => 'Kunde inte uppdatera tavlan',
'Disable' => 'Inaktivera',
'Enable' => 'Aktivera',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Slutfört',
'Application version:' => 'Version:',
'Id' => 'ID',
- '%d closed tasks' => '%d stängda uppgifter',
- 'No task for this project' => 'Inga uppgifter i detta projekt',
'Public link' => 'Publik länk',
'Timezone' => 'Tidszon',
'Sorry, I didn\'t find this information in my database!' => 'Informationen kunde inte hittas i databasen.',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Skapa uppgift',
'Closing a task' => 'Stänger en uppgift',
'Assign a color to a specific user' => 'Tilldela en färg till en specifik användare',
- 'Column title' => 'Kolumnens titel',
'Position' => 'Position',
'Duplicate to another project' => 'Kopiera till ett annat projekt',
'Duplicate' => 'Kopiera uppgiften',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Jag vill endast få notiser för dessa projekt:',
'view the task on Kanboard' => 'Visa uppgiften på Kanboard',
'Public access' => 'Publik åtkomst',
- 'Active tasks' => 'Aktiva uppgifter',
'Disable public access' => 'Inaktivera publik åtkomst',
'Enable public access' => 'Aktivera publik åtkomst',
'Public access disabled' => 'Publik åtkomst har inaktiverats',
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index d08c3b74..06aa3256 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'การกระทำ',
'Inactive' => 'ไม่เปิดใช้งาน',
'Active' => 'เปิดใช้งาน',
- '%d tasks on the board' => '%d งานบนบอร์ด',
- '%d tasks in total' => '%d งานทั้งหมด',
'Unable to update this board.' => 'ไม่สามารถปรับปรุงบอร์ดได้.',
'Disable' => 'ปิดการทำงาน',
'Enable' => 'เปิดการทำงาน',
@@ -146,8 +144,6 @@ return array(
'Done' => 'เสร็จ',
'Application version:' => 'แอพเวอร์ชัน:',
'Id' => 'ไอดี',
- '%d closed tasks' => '%d งานที่ปิด',
- 'No task for this project' => 'ไม่มีงานสำหรับโปรเจคนี้',
'Public link' => 'ลิงค์สาธารณะ',
'Timezone' => 'เขตเวลา',
'Sorry, I didn\'t find this information in my database!' => 'เสียใจด้วย ไม่สามารถหาข้อมูลในฐานข้อมูลได้',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'สร้างงาน',
'Closing a task' => 'กำลังปิดงาน',
'Assign a color to a specific user' => 'กำหนดสีให้ผู้ใช้แบบเจาะจง',
- 'Column title' => 'หัวเรื่องคอลัมน์',
'Position' => 'ตำแหน่ง',
'Duplicate to another project' => 'ทำซ้ำในโปรเจคอื่น',
'Duplicate' => 'ทำซ้ำ',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'ฉันต้องการรับการแจ้งเตือนสำหรับโปรเจค:',
'view the task on Kanboard' => 'แสดงงานบน Kanboard',
'Public access' => 'การเข้าถึงสาธารณะ',
- 'Active tasks' => 'งานที่กำลังใช้งาน',
'Disable public access' => 'ปิดการเข้าถึงสาธารณะ',
'Enable public access' => 'เปิดการเข้าถึงสาธารณะ',
'Public access disabled' => 'การเข้าถึงสาธารณะถูกปิด',
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index e4589bea..9e12b97b 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => 'İşlemler',
'Inactive' => 'Aktif değil',
'Active' => 'Aktif',
- '%d tasks on the board' => '%d görev bu panoda',
- '%d tasks in total' => '%d görev toplam',
'Unable to update this board.' => 'Bu pano güncellenemiyor.',
'Disable' => 'Devre dışı bırak',
'Enable' => 'Etkinleştir',
@@ -146,8 +144,6 @@ return array(
'Done' => 'Tamamlandı',
'Application version:' => 'Uygulama versiyonu:',
'Id' => 'Kod',
- '%d closed tasks' => '%d kapatılmış görevler',
- 'No task for this project' => 'Bu proje için görev yok',
'Public link' => 'Dışa açık link',
'Timezone' => 'Saat dilimi',
'Sorry, I didn\'t find this information in my database!' => 'Üzgünüm, bu bilgiyi veri tabanımda bulamadım.',
@@ -188,7 +184,6 @@ return array(
'Task creation' => 'Görev oluşturma',
'Closing a task' => 'Bir görev kapatılıyor',
'Assign a color to a specific user' => 'Bir kullanıcıya renk tanımla',
- 'Column title' => 'Sütun başlığı',
'Position' => 'Pozisyon',
'Duplicate to another project' => 'Başka bir projeye kopyala',
'Duplicate' => 'Kopya oluştur',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => 'Yalnızca bu projelerle ilgili bildirim almak istiyorum:',
'view the task on Kanboard' => 'bu görevi Kanboard üzerinde göster',
'Public access' => 'Dışa açık erişim',
- 'Active tasks' => 'Aktif görevler',
'Disable public access' => 'Dışa açık erişimi kapat',
'Enable public access' => 'Dışa açık erişimi aç',
'Public access disabled' => 'Dışa açık erişim kapatıldı',
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 587ae27d..838147ec 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -58,8 +58,6 @@ return array(
'Actions' => '动作',
'Inactive' => '未激活',
'Active' => '激活',
- '%d tasks on the board' => '看板目前有%d个任务',
- '%d tasks in total' => '总共有%d个任务',
'Unable to update this board.' => '无法更新该看板。',
'Disable' => '停用',
'Enable' => '启用',
@@ -146,8 +144,6 @@ return array(
'Done' => '完成',
'Application version:' => '应用程序版本:',
'Id' => '编号',
- '%d closed tasks' => '%d个已关闭任务',
- 'No task for this project' => '该项目尚无任务',
'Public link' => '公开链接',
'Timezone' => '时区',
'Sorry, I didn\'t find this information in my database!' => '抱歉,无法在数据库中找到该信息!',
@@ -188,7 +184,6 @@ return array(
'Task creation' => '任务创建',
'Closing a task' => '正在关闭任务',
'Assign a color to a specific user' => '为特定用户指派颜色',
- 'Column title' => '栏目名称',
'Position' => '位置',
'Duplicate to another project' => '复制到另一项目',
'Duplicate' => '复制',
@@ -318,7 +313,6 @@ return array(
'I want to receive notifications only for those projects:' => '我仅需要收到下面项目的通知:',
'view the task on Kanboard' => '在看板中查看此任务',
'Public access' => '公开访问',
- 'Active tasks' => '活动任务',
'Disable public access' => '停止公开访问',
'Enable public access' => '开启公开访问',
'Public access disabled' => '已经禁止公开访问',
diff --git a/app/Model/BoardModel.php b/app/Model/BoardModel.php
index 4d559936..d80fb28f 100644
--- a/app/Model/BoardModel.php
+++ b/app/Model/BoardModel.php
@@ -92,24 +92,4 @@ class BoardModel extends Base
return $this->boardModel->create($project_to, $columns);
}
-
- /**
- * Get the total of tasks per column
- *
- * @access public
- * @param integer $project_id
- * @param boolean $prepend Prepend default value
- * @return array
- */
- public function getColumnStats($project_id, $prepend = false)
- {
- $listing = $this->db
- ->hashtable(TaskModel::TABLE)
- ->eq('project_id', $project_id)
- ->eq('is_active', 1)
- ->groupBy('column_id')
- ->getAll('column_id', 'COUNT(*) AS total');
-
- return $prepend ? array(-1 => t('All columns')) + $listing : $listing;
- }
}
diff --git a/app/Model/ProjectModel.php b/app/Model/ProjectModel.php
index 080217cb..7f9cfb9b 100644
--- a/app/Model/ProjectModel.php
+++ b/app/Model/ProjectModel.php
@@ -262,32 +262,6 @@ class ProjectModel extends Base
}
/**
- * Gather some task metrics for a given project
- *
- * @access public
- * @param integer $project_id Project id
- * @return array
- */
- public function getTaskStats($project_id)
- {
- $stats = array();
- $stats['nb_active_tasks'] = 0;
- $columns = $this->columnModel->getAll($project_id);
- $column_stats = $this->boardModel->getColumnStats($project_id);
-
- foreach ($columns as &$column) {
- $column['nb_active_tasks'] = isset($column_stats[$column['id']]) ? $column_stats[$column['id']] : 0;
- $stats['nb_active_tasks'] += $column['nb_active_tasks'];
- }
-
- $stats['columns'] = $columns;
- $stats['nb_tasks'] = $this->taskFinderModel->countByProjectId($project_id);
- $stats['nb_inactive_tasks'] = $stats['nb_tasks'] - $stats['nb_active_tasks'];
-
- return $stats;
- }
-
- /**
* Get stats for each column of a project
*
* @access public
@@ -296,13 +270,11 @@ class ProjectModel extends Base
*/
public function getColumnStats(array &$project)
{
- $project['columns'] = $this->columnModel->getAll($project['id']);
+ $project['columns'] = $this->columnModel->getAllWithTasksCount($project['id']);
$project['nb_active_tasks'] = 0;
- $stats = $this->boardModel->getColumnStats($project['id']);
- foreach ($project['columns'] as &$column) {
- $column['nb_tasks'] = isset($stats[$column['id']]) ? $stats[$column['id']] : 0;
- $project['nb_active_tasks'] += $column['nb_tasks'];
+ foreach ($project['columns'] as $column) {
+ $project['nb_active_tasks'] += $column['nb_open_tasks'];
}
return $project;
diff --git a/app/Template/column/index.php b/app/Template/column/index.php
index 0b14e341..6108661b 100644
--- a/app/Template/column/index.php
+++ b/app/Template/column/index.php
@@ -15,7 +15,7 @@
data-save-position-url="<?= $this->url->href('ColumnController', 'move', array('project_id' => $project['id'])) ?>">
<thead>
<tr>
- <th class="column-40"><?= t('Column title') ?></th>
+ <th class="column-40"><?= t('Column') ?></th>
<th class="column-10"><?= t('Task limit') ?></th>
<th class="column-20"><?= t('Visible on dashboard') ?></th>
<th class="column-10"><?= t('Open tasks') ?></th>
@@ -36,10 +36,10 @@
<?php endif ?>
</td>
<td>
- <?= $this->text->e($column['task_limit']) ?>
+ <?= $column['task_limit'] ?: '∞' ?>
</td>
<td>
- <?= $column['hide_in_dashboard'] == 1 ? t('Yes') : t('No') ?>
+ <?= $column['hide_in_dashboard'] == 0 ? t('Yes') : t('No') ?>
</td>
<td>
<?= $column['nb_open_tasks'] ?>
diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php
index f8806c01..7e35b059 100644
--- a/app/Template/dashboard/projects.php
+++ b/app/Template/dashboard/projects.php
@@ -42,7 +42,7 @@
</td>
<td class="dashboard-project-stats">
<?php foreach ($project['columns'] as $column): ?>
- <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+ <strong title="<?= t('Task count') ?>"><?= $column['nb_open_tasks'] ?></strong>
<small><?= $this->text->e($column['title']) ?></small>
<?php endforeach ?>
</td>
diff --git a/app/Template/project_list/show.php b/app/Template/project_list/show.php
index a6364585..9dfae24c 100644
--- a/app/Template/project_list/show.php
+++ b/app/Template/project_list/show.php
@@ -88,7 +88,7 @@
<?php endif ?>
<td class="dashboard-project-stats">
<?php foreach ($project['columns'] as $column): ?>
- <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+ <strong title="<?= t('Task count') ?>"><?= $column['nb_open_tasks'] ?></strong>
<small><?= $this->text->e($column['title']) ?></small>
<?php endforeach ?>
</td>
diff --git a/app/Template/project_overview/columns.php b/app/Template/project_overview/columns.php
index daae9ca7..f1472ff3 100644
--- a/app/Template/project_overview/columns.php
+++ b/app/Template/project_overview/columns.php
@@ -1,7 +1,7 @@
<div class="project-overview-columns">
- <?php foreach ($project['columns'] as $column): ?>
+ <?php foreach ($columns as $column): ?>
<div class="project-overview-column">
- <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+ <strong title="<?= t('Task count') ?>"><?= $column['nb_open_tasks'] ?></strong>
<small><?= $this->text->e($column['title']) ?></small>
</div>
<?php endforeach ?>
diff --git a/app/Template/project_overview/show.php b/app/Template/project_overview/show.php
index d87b2775..8bd711f0 100644
--- a/app/Template/project_overview/show.php
+++ b/app/Template/project_overview/show.php
@@ -1,6 +1,6 @@
<section id="main">
<?= $this->projectHeader->render($project, 'ProjectOverviewController', 'show') ?>
- <?= $this->render('project_overview/columns', array('project' => $project)) ?>
+ <?= $this->render('project_overview/columns', array('project' => $project, 'columns' => $columns)) ?>
<?= $this->hook->render('template:project-overview:before-description', array('project' => $project)) ?>
<?= $this->render('project_overview/description', array('project' => $project)) ?>
<?= $this->render('project_overview/attachments', array('project' => $project, 'images' => $images, 'files' => $files)) ?>
diff --git a/app/Template/project_user_overview/roles.php b/app/Template/project_user_overview/roles.php
index 011714d4..b8c67323 100644
--- a/app/Template/project_user_overview/roles.php
+++ b/app/Template/project_user_overview/roles.php
@@ -21,7 +21,7 @@
</td>
<td class="dashboard-project-stats">
<?php foreach ($project['columns'] as $column): ?>
- <strong title="<?= t('Task count') ?>"><?= $column['nb_tasks'] ?></strong>
+ <strong title="<?= t('Task count') ?>"><?= $column['nb_open_tasks'] ?></strong>
<span><?= $this->text->e($column['title']) ?></span>
<?php endforeach ?>
</td>
diff --git a/app/Template/project_view/show.php b/app/Template/project_view/show.php
index 29d558b1..7dee08be 100644
--- a/app/Template/project_view/show.php
+++ b/app/Template/project_view/show.php
@@ -31,57 +31,8 @@
<?php if ($project['end_date']): ?>
<li><?= t('End date: ').$this->dt->date($project['end_date']) ?></li>
<?php endif ?>
-
- <?php if ($stats['nb_tasks'] > 0): ?>
-
- <?php if ($stats['nb_active_tasks'] > 0): ?>
- <li><?= $this->url->link(t('%d tasks on the board', $stats['nb_active_tasks']), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => 'status:open')) ?></li>
- <?php endif ?>
-
- <?php if ($stats['nb_inactive_tasks'] > 0): ?>
- <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li>
- <?php endif ?>
-
- <li><?= t('%d tasks in total', $stats['nb_tasks']) ?></li>
-
- <?php else: ?>
- <li><?= t('No task for this project') ?></li>
- <?php endif ?>
</ul>
-<div class="page-header">
- <h2><?= t('Board') ?></h2>
-</div>
-<table class="table-striped table-scrolling">
- <tr>
- <th class="column-40"><?= t('Column') ?></th>
- <th class="column-20"><?= t('Task limit') ?></th>
- <th class="column-20"><?= t('Active tasks') ?></th>
- <th class="column-20"><?= t('Hide tasks in this column in the dashboard') ?></th>
- </tr>
- <?php foreach ($stats['columns'] as $column): ?>
- <tr>
- <td>
- <?= $this->text->e($column['title']) ?>
- <?php if (! empty($column['description'])): ?>
- <span class="tooltip" title="<?= $this->text->markdownAttribute($column['description']) ?>">
- <i class="fa fa-info-circle"></i>
- </span>
- <?php endif ?>
- </td>
- <td><?= $column['task_limit'] ?: '∞' ?></td>
- <td><?= $column['nb_active_tasks'] ?></td>
- <td>
- <?php if ($column['hide_in_dashboard'] == 1): ?>
- <?= t('Yes') ?>
- <?php else: ?>
- <?= t('No') ?>
- <?php endif ?>
- </td>
- </tr>
- <?php endforeach ?>
-</table>
-
<?php if (! empty($project['description'])): ?>
<div class="page-header">
<h2><?= t('Description') ?></h2>
@@ -91,3 +42,48 @@
<?= $this->text->markdown($project['description']) ?>
</article>
<?php endif ?>
+
+<div class="page-header">
+ <h2><?= t('Columns') ?></h2>
+</div>
+<?php if (empty($columns)): ?>
+ <p class="alert alert-error"><?= t('Your board doesn\'t have any columns!') ?></p>
+<?php else: ?>
+ <table class="table-striped table-scrolling"
+ <thead>
+ <tr>
+ <th class="column-40"><?= t('Column') ?></th>
+ <th class="column-10"><?= t('Task limit') ?></th>
+ <th class="column-20"><?= t('Visible on dashboard') ?></th>
+ <th class="column-15"><?= t('Open tasks') ?></th>
+ <th class="column-15"><?= t('Closed tasks') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($columns as $column): ?>
+ <tr data-column-id="<?= $column['id'] ?>">
+ <td>
+ <?= $this->text->e($column['title']) ?>
+ <?php if (! empty($column['description'])): ?>
+ <span class="tooltip" title="<?= $this->text->markdownAttribute($column['description']) ?>">
+ <i class="fa fa-info-circle"></i>
+ </span>
+ <?php endif ?>
+ </td>
+ <td>
+ <?= $column['task_limit'] ?: '∞' ?>
+ </td>
+ <td>
+ <?= $column['hide_in_dashboard'] == 0 ? t('Yes') : t('No') ?>
+ </td>
+ <td>
+ <?= $column['nb_open_tasks'] ?>
+ </td>
+ <td>
+ <?= $column['nb_closed_tasks'] ?>
+ </td>
+ </tr>
+ <?php endforeach ?>
+ </tbody>
+ </table>
+<?php endif ?>