diff --git a/config/locales/bg.yml b/config/locales/bg.yml index de0762ad8..396b098be 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -579,7 +579,7 @@ bg: default_tracker_feature: Функционалност default_tracker_support: Поддръжка default_issue_status_new: Нова - default_issue_status_assigned: Възложена + default_issue_status_in_progress: In Progress default_issue_status_resolved: Приключена default_issue_status_feedback: Обратна връзка default_issue_status_closed: Затворена diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 86896b6ed..72a53ff6b 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -793,7 +793,7 @@ bs: default_tracker_feature: Nova funkcija default_tracker_support: Podrška default_issue_status_new: Novi - default_issue_status_assigned: Dodjeljen + default_issue_status_in_progress: In Progress default_issue_status_resolved: Riješen default_issue_status_feedback: Čeka se povratna informacija default_issue_status_closed: Zatvoren diff --git a/config/locales/ca.yml b/config/locales/ca.yml index ff28ba34c..080f15150 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -780,7 +780,7 @@ ca: default_tracker_feature: Característica default_tracker_support: Suport default_issue_status_new: Nou - default_issue_status_assigned: Assignat + default_issue_status_in_progress: In Progress default_issue_status_resolved: Resolt default_issue_status_feedback: Comentaris default_issue_status_closed: Tancat diff --git a/config/locales/cs.yml b/config/locales/cs.yml index ab5603f4b..27b0440b6 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -686,7 +686,7 @@ cs: default_tracker_feature: Požadavek default_tracker_support: Podpora default_issue_status_new: Nový - default_issue_status_assigned: Přiřazený + default_issue_status_in_progress: In Progress default_issue_status_resolved: Vyřešený default_issue_status_feedback: Čeká se default_issue_status_closed: Uzavřený diff --git a/config/locales/da.yml b/config/locales/da.yml index 924ae80b6..8244b1ecb 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -688,7 +688,7 @@ da: default_tracker_feature: Feature default_tracker_support: Support default_issue_status_new: Ny - default_issue_status_assigned: Tildelt + default_issue_status_in_progress: In Progress default_issue_status_resolved: Løst default_issue_status_feedback: Feedback default_issue_status_closed: Lukket diff --git a/config/locales/de.yml b/config/locales/de.yml index f90528458..4a6b2fc59 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -788,7 +788,7 @@ de: default_tracker_feature: Feature default_tracker_support: Unterstützung default_issue_status_new: Neu - default_issue_status_assigned: Zugewiesen + default_issue_status_in_progress: In Progress default_issue_status_resolved: Gelöst default_issue_status_feedback: Feedback default_issue_status_closed: Erledigt diff --git a/config/locales/el.yml b/config/locales/el.yml index 7dab6c2fe..fc7577308 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -804,7 +804,7 @@ el: default_tracker_feature: Λειτουργίες default_tracker_support: Υποστήριξη default_issue_status_new: Νέα - default_issue_status_assigned: Ανατεθειμένο + default_issue_status_in_progress: In Progress default_issue_status_resolved: Επιλυμένο default_issue_status_feedback: Σχόλια default_issue_status_closed: Κλειστό diff --git a/config/locales/en.yml b/config/locales/en.yml index 93cdfbfd7..f46c57c08 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -810,7 +810,7 @@ en: default_tracker_feature: Feature default_tracker_support: Support default_issue_status_new: New - default_issue_status_assigned: Assigned + default_issue_status_in_progress: In Progress default_issue_status_resolved: Resolved default_issue_status_feedback: Feedback default_issue_status_closed: Closed diff --git a/config/locales/es.yml b/config/locales/es.yml index f249d4847..e81aefa5f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -212,7 +212,7 @@ es: default_activity_development: Desarrollo default_doc_category_tech: Documentación técnica default_doc_category_user: Documentación de usuario - default_issue_status_assigned: Asignada + default_issue_status_in_progress: In Progress default_issue_status_closed: Cerrada default_issue_status_feedback: Comentarios default_issue_status_new: Nueva diff --git a/config/locales/fi.yml b/config/locales/fi.yml index ccdb51b2c..4550f3b9b 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -662,7 +662,7 @@ fi: default_tracker_feature: Ominaisuus default_tracker_support: Tuki default_issue_status_new: Uusi - default_issue_status_assigned: Nimetty + default_issue_status_in_progress: In Progress default_issue_status_resolved: Hyväksytty default_issue_status_feedback: Palaute default_issue_status_closed: Suljettu diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0b34edc73..1e8d179d7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -823,7 +823,7 @@ fr: default_tracker_feature: Evolution default_tracker_support: Assistance default_issue_status_new: Nouveau - default_issue_status_assigned: Assigné + default_issue_status_in_progress: In Progress default_issue_status_resolved: Résolu default_issue_status_feedback: Commentaire default_issue_status_closed: Fermé diff --git a/config/locales/gl.yml b/config/locales/gl.yml index e98bc74ad..24cbd8854 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -191,7 +191,7 @@ gl: default_activity_development: Desenvolvemento default_doc_category_tech: Documentación técnica default_doc_category_user: Documentación de usuario - default_issue_status_assigned: Asignada + default_issue_status_in_progress: In Progress default_issue_status_closed: Pechada default_issue_status_feedback: Comentarios default_issue_status_new: Nova diff --git a/config/locales/he.yml b/config/locales/he.yml index df8bb5268..aff046da0 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -601,7 +601,7 @@ he: default_tracker_feature: פיצ'ר default_tracker_support: תמיכה default_issue_status_new: חדש - default_issue_status_assigned: מוצב + default_issue_status_in_progress: In Progress default_issue_status_resolved: פתור default_issue_status_feedback: משוב default_issue_status_closed: סגור diff --git a/config/locales/hu.yml b/config/locales/hu.yml index c17912058..3aecfa55e 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -715,7 +715,7 @@ default_tracker_feature: Fejlesztés default_tracker_support: Support default_issue_status_new: Új - default_issue_status_assigned: Kiosztva + default_issue_status_in_progress: In Progress default_issue_status_resolved: Megoldva default_issue_status_feedback: Visszajelzés default_issue_status_closed: Lezárt diff --git a/config/locales/it.yml b/config/locales/it.yml index 63d7e4061..15f4074f4 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -592,7 +592,7 @@ it: default_tracker_feature: Funzione default_tracker_support: Supporto default_issue_status_new: Nuovo - default_issue_status_assigned: Assegnato + default_issue_status_in_progress: In Progress default_issue_status_resolved: Risolto default_issue_status_feedback: Feedback default_issue_status_closed: Chiuso diff --git a/config/locales/ja.yml b/config/locales/ja.yml index cdf9d1bf2..f7c540c88 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -840,7 +840,7 @@ ja: default_tracker_feature: 機能 default_tracker_support: サポート default_issue_status_new: 新規 - default_issue_status_assigned: 担当 + default_issue_status_in_progress: In Progress default_issue_status_resolved: 解決 default_issue_status_feedback: フィードバック default_issue_status_closed: 終了 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 356cfb7a2..6bd26a5a7 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -857,7 +857,7 @@ ko: default_tracker_feature: 새기능 default_tracker_support: 지원 default_issue_status_new: 신규 - default_issue_status_assigned: 할당 + default_issue_status_in_progress: In Progress default_issue_status_resolved: 해결 default_issue_status_feedback: 의견 default_issue_status_closed: 완료 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 8ad111506..9645b643a 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -796,7 +796,7 @@ lt: default_tracker_feature: Ypatybė default_tracker_support: Palaikymas default_issue_status_new: Nauja - default_issue_status_assigned: Priskirta + default_issue_status_in_progress: In Progress default_issue_status_resolved: Išspręsta default_issue_status_feedback: Grįžtamasis ryšys default_issue_status_closed: Uždaryta diff --git a/config/locales/nl.yml b/config/locales/nl.yml index b759e4239..f80814e25 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -153,7 +153,7 @@ nl: default_activity_development: Ontwikkeling default_doc_category_tech: Technische documentatie default_doc_category_user: Gebruikersdocumentatie - default_issue_status_assigned: Toegewezen + default_issue_status_in_progress: In Progress default_issue_status_closed: Gesloten default_issue_status_feedback: Terugkoppeling default_issue_status_new: Nieuw diff --git a/config/locales/no.yml b/config/locales/no.yml index e05ce2bfe..6cfbee22d 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -690,7 +690,7 @@ default_tracker_feature: Funksjon default_tracker_support: Support default_issue_status_new: Ny - default_issue_status_assigned: Tildelt + default_issue_status_in_progress: In Progress default_issue_status_resolved: Avklart default_issue_status_feedback: Tilbakemelding default_issue_status_closed: Lukket diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 53e089c4e..5bf1e361d 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -177,7 +177,7 @@ pl: default_activity_development: Rozwój default_doc_category_tech: Dokumentacja techniczna default_doc_category_user: Dokumentacja użytkownika - default_issue_status_assigned: Przypisany + default_issue_status_in_progress: In Progress default_issue_status_closed: Zamknięty default_issue_status_feedback: Odpowiedź default_issue_status_new: Nowy diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 190d5bd3e..f20501aa8 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -735,7 +735,7 @@ pt-BR: default_tracker_feature: Funcionalidade default_tracker_support: Suporte default_issue_status_new: Nova - default_issue_status_assigned: Atribuída + default_issue_status_in_progress: In Progress default_issue_status_resolved: Resolvida default_issue_status_feedback: Feedback default_issue_status_closed: Fechada diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 414494dca..436e77a73 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -722,7 +722,7 @@ pt: default_tracker_feature: Funcionalidade default_tracker_support: Suporte default_issue_status_new: Novo - default_issue_status_assigned: Atribuído + default_issue_status_in_progress: In Progress default_issue_status_resolved: Resolvido default_issue_status_feedback: Feedback default_issue_status_closed: Fechado diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 982d9e8ca..9c89f89b5 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -780,7 +780,7 @@ ro: default_tracker_feature: Funcție default_tracker_support: Suport default_issue_status_new: Nou - default_issue_status_assigned: Atribuit + default_issue_status_in_progress: In Progress default_issue_status_resolved: Rezolvat default_issue_status_feedback: Așteaptă reacții default_issue_status_closed: Închis diff --git a/config/locales/ru.yml b/config/locales/ru.yml index ccb4634c2..cdaffb951 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -249,7 +249,7 @@ ru: default_activity_development: Разработка default_doc_category_tech: Техническая документация default_doc_category_user: Документация пользователя - default_issue_status_assigned: Назначен + default_issue_status_in_progress: In Progress default_issue_status_closed: Закрыт default_issue_status_feedback: Обратная связь default_issue_status_new: Новый diff --git a/config/locales/sk.yml b/config/locales/sk.yml index e154b9eda..9124baf6b 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -684,7 +684,7 @@ sk: default_tracker_feature: Rozšírenie default_tracker_support: Podpora default_issue_status_new: Nový - default_issue_status_assigned: Priradený + default_issue_status_in_progress: In Progress default_issue_status_resolved: Vyriešený default_issue_status_feedback: Čaká sa default_issue_status_closed: Uzavrený diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 30b8b76b6..fb2545a6d 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -762,7 +762,7 @@ sl: default_tracker_feature: Funkcija default_tracker_support: Podpora default_issue_status_new: Nov - default_issue_status_assigned: Dodeljen + default_issue_status_in_progress: In Progress default_issue_status_resolved: Rešen default_issue_status_feedback: Povratna informacija default_issue_status_closed: Zaključen diff --git a/config/locales/sr.yml b/config/locales/sr.yml index bef564333..1f8f4e106 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -623,7 +623,7 @@ default_tracker_feature: Nova osobina default_tracker_support: Podrška default_issue_status_new: Novo - default_issue_status_assigned: Dodeljeno + default_issue_status_in_progress: In Progress default_issue_status_resolved: Rešeno default_issue_status_feedback: Povratna informacija default_issue_status_closed: Zatvoreno diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 2c7df385b..0a886ad68 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -854,7 +854,7 @@ sv: default_tracker_feature: Funktionalitet default_tracker_support: Support default_issue_status_new: Ny - default_issue_status_assigned: Tilldelad + default_issue_status_in_progress: In Progress default_issue_status_resolved: Löst default_issue_status_feedback: Feedback default_issue_status_closed: Stängd diff --git a/config/locales/th.yml b/config/locales/th.yml index bf694e20b..9c4a4bca2 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -686,7 +686,7 @@ th: default_tracker_feature: ลักษณะเด่น default_tracker_support: สนับสนุน default_issue_status_new: เกิดขึ้น - default_issue_status_assigned: รับมอบหมาย + default_issue_status_in_progress: In Progress default_issue_status_resolved: ดำเนินการ default_issue_status_feedback: รอคำตอบ default_issue_status_closed: จบ diff --git a/config/locales/tr.yml b/config/locales/tr.yml index ec5e4a964..959d991e5 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -715,7 +715,7 @@ tr: default_tracker_feature: ÖZellik default_tracker_support: Destek default_issue_status_new: Yeni - default_issue_status_assigned: Atandı + default_issue_status_in_progress: In Progress default_issue_status_resolved: Çözüldü default_issue_status_feedback: Geribildirim default_issue_status_closed: Kapatıldı diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b1839323e..a4f5b4812 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -616,7 +616,7 @@ uk: default_tracker_feature: Властивість default_tracker_support: Підтримка default_issue_status_new: Новий - default_issue_status_assigned: Призначено + default_issue_status_in_progress: In Progress default_issue_status_resolved: Вирішено default_issue_status_feedback: Зворотний зв'язок default_issue_status_closed: Зачинено diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 99555379d..8c48a2bcd 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -767,7 +767,7 @@ vi: default_tracker_feature: Tính năng default_tracker_support: Hỗ trợ default_issue_status_new: Mới - default_issue_status_assigned: Đã gán + default_issue_status_in_progress: In Progress default_issue_status_resolved: Quyết tâm default_issue_status_feedback: Phản hồi default_issue_status_closed: Đóng diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 4de049201..6a1f02c2b 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -901,7 +901,7 @@ default_tracker_feature: 功能 default_tracker_support: 支援 default_issue_status_new: 新建立 - default_issue_status_assigned: 已指派 + default_issue_status_in_progress: In Progress default_issue_status_resolved: 已解決 default_issue_status_feedback: 已回應 default_issue_status_closed: 已結束 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 802d1802d..09604a413 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -834,7 +834,7 @@ zh: default_tracker_feature: 功能 default_tracker_support: 支持 default_issue_status_new: 新建 - default_issue_status_assigned: 已指派 + default_issue_status_in_progress: In Progress default_issue_status_resolved: 已解决 default_issue_status_feedback: 反馈 default_issue_status_closed: 已关闭 diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb index 3f1103ae3..435215b1d 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -123,7 +123,7 @@ module Redmine # Issue statuses new = IssueStatus.create!(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :position => 1) - assigned = IssueStatus.create!(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :position => 2) + in_progress = IssueStatus.create!(:name => l(:default_issue_status_in_progress), :is_closed => false, :is_default => false, :position => 2) resolved = IssueStatus.create!(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :position => 3) feedback = IssueStatus.create!(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :position => 4) closed = IssueStatus.create!(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :position => 5) @@ -139,15 +139,15 @@ module Redmine } Tracker.find(:all).each { |t| - [new, assigned, resolved, feedback].each { |os| - [assigned, resolved, feedback, closed].each { |ns| + [new, in_progress, resolved, feedback].each { |os| + [in_progress, resolved, feedback, closed].each { |ns| Workflow.create!(:tracker_id => t.id, :role_id => developper.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns } } } Tracker.find(:all).each { |t| - [new, assigned, resolved, feedback].each { |os| + [new, in_progress, resolved, feedback].each { |os| [closed].each { |ns| Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns }