From d79ba00e7d68b840f370c3e1269f6355d22a3e4b Mon Sep 17 00:00:00 2001 From: Krokop Date: Wed, 6 Dec 2017 12:41:28 +0200 Subject: [PATCH 01/29] ungettext doesn't work with undefined vars, need to set default value --- ckanext/issues/templates/snippets/search_result_text.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ckanext/issues/templates/snippets/search_result_text.html b/ckanext/issues/templates/snippets/search_result_text.html index 5a4ea0de..aae88f4e 100644 --- a/ckanext/issues/templates/snippets/search_result_text.html +++ b/ckanext/issues/templates/snippets/search_result_text.html @@ -1,4 +1,5 @@ {% if type == 'issue' %} + {% set count=count if count else 0 %} {% set text_query = ungettext('{number} issue found for "{query}"', '{number} issues found for "{query}"', count) %} {% set text_query_none = _('No issues found for "{query}"') %} {% set text_no_query = ungettext('{number} issue found', '{number} issues found', count) %} From f14848f0815f91515dc8bc0b21529fd740ae2c7a Mon Sep 17 00:00:00 2001 From: Oleg Serbokryl Date: Fri, 23 Mar 2018 15:24:52 +0200 Subject: [PATCH 02/29] add translations (#2) * add translations * updated plugin --- ckanext/issues/i18n/ckanext-issues.pot | 462 +++++++++++++++++ .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo | Bin 0 -> 7475 bytes .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 468 ++++++++++++++++++ ckanext/issues/plugin.py | 12 +- .../templates/issues/email/new_comment.html | 2 +- .../templates/issues/email/new_issue.html | 19 +- setup.cfg | 25 + setup.py | 15 + 8 files changed, 992 insertions(+), 11 deletions(-) create mode 100644 ckanext/issues/i18n/ckanext-issues.pot create mode 100644 ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo create mode 100644 ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po diff --git a/ckanext/issues/i18n/ckanext-issues.pot b/ckanext/issues/i18n/ckanext-issues.pot new file mode 100644 index 00000000..8da087b4 --- /dev/null +++ b/ckanext/issues/i18n/ckanext-issues.pot @@ -0,0 +1,462 @@ +# Translations template for ckanext-issues. +# Copyright (C) 2018 ORGANIZATION +# This file is distributed under the same license as the ckanext-issues project. +# FIRST AUTHOR , 2018. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ckanext-issues 0.3\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2018-03-20 22:27+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +#: ckanext/issues/auth.py:20 +msgid "User {0} not authorized for action on issue {1}" +msgstr "" + +#: ckanext/issues/auth.py:42 +msgid "User {0} not authorized for action" +msgstr "" + +#: ckanext/issues/auth.py:91 +msgid "User {user} not authorized for action on issue {issue}" +msgstr "" + +#: ckanext/issues/controller/controller.py:48 +msgid "Issues have not been enabled for this dataset" +msgstr "" + +#: ckanext/issues/controller/controller.py:51 +#: ckanext/issues/controller/controller.py:69 +msgid "Dataset not found" +msgstr "" + +#: ckanext/issues/controller/controller.py:54 +msgid "Unauthorized to view issues for this dataset" +msgstr "" + +#: ckanext/issues/controller/controller.py:66 +msgid "Issues have not been enabled for this organization" +msgstr "" + +#: ckanext/issues/controller/controller.py:72 +msgid "Unauthorized to view issues for this organization" +msgstr "" + +#: ckanext/issues/controller/controller.py:77 +msgid "Please login to add a new issue" +msgstr "" + +#: ckanext/issues/controller/controller.py:86 +msgid "Not authorized to add a new issue" +msgstr "" + +#: ckanext/issues/controller/controller.py:113 +msgid "Your issue has been registered, thank you for the feedback" +msgstr "" + +#: ckanext/issues/controller/controller.py:131 +#: ckanext/issues/controller/controller.py:134 +msgid "Issue not found: {0}" +msgstr "" + +#: ckanext/issues/controller/controller.py:178 +msgid "Invalid request" +msgstr "" + +#: ckanext/issues/controller/controller.py:190 +msgid "Not authorized" +msgstr "" + +#: ckanext/issues/controller/controller.py:199 +msgid "Comment cannot be empty" +msgstr "" + +#: ckanext/issues/controller/controller.py:215 +msgid "Issue closed" +msgstr "" + +#: ckanext/issues/controller/controller.py:217 +msgid "Issue re-opened" +msgstr "" + +#: ckanext/issues/controller/controller.py:255 +msgid "Unauthorized to delete issue {0}" +msgstr "" + +#: ckanext/issues/controller/controller.py:260 +msgid "Issue {0} has been deleted." +msgstr "" + +#: ckanext/issues/controller/controller.py:278 +msgid "User {0} does not exist" +msgstr "" + +#: ckanext/issues/controller/controller.py:298 +msgid "Assigned to {user}" +msgstr "" + +#: ckanext/issues/controller/controller.py:308 +msgid "Unauthorized to assign users to issue" +msgstr "" + +#: ckanext/issues/controller/controller.py:322 +msgid "You must be logged in to report issues" +msgstr "" + +#: ckanext/issues/controller/controller.py:333 +#: ckanext/issues/controller/controller.py:370 +msgid "Report acknowledged." +msgstr "" + +#: ckanext/issues/controller/controller.py:336 +#: ckanext/issues/controller/controller.py:373 +msgid "Marked as abuse/spam." +msgstr "" + +#: ckanext/issues/controller/controller.py:337 +msgid "Issue is visible." +msgstr "" + +#: ckanext/issues/controller/controller.py:339 +msgid "Issue is invisible to normal users." +msgstr "" + +#: ckanext/issues/controller/controller.py:342 +msgid "Issue reported to an administrator" +msgstr "" + +#: ckanext/issues/controller/controller.py:358 +msgid "You must be logged in to report comments" +msgstr "" + +#: ckanext/issues/controller/controller.py:374 +msgid "Comment is visible." +msgstr "" + +#: ckanext/issues/controller/controller.py:376 +msgid "Comment is invisible to normal users." +msgstr "" + +#: ckanext/issues/controller/controller.py:379 +msgid "Comment has been reported to an administrator" +msgstr "" + +#: ckanext/issues/controller/controller.py:402 +msgid "Issue report cleared" +msgstr "" + +#: ckanext/issues/controller/controller.py:407 +msgid "You must be logged in clear abuse reports" +msgstr "" + +#: ckanext/issues/controller/controller.py:425 +msgid "Spam/abuse report cleared" +msgstr "" + +#: ckanext/issues/controller/controller.py:430 +msgid "You must be logged in to clear abuse reports" +msgstr "" + +#: ckanext/issues/controller/controller.py:447 +#: ckanext/issues/controller/controller.py:487 +msgid "Validation error: {0}" +msgstr "" + +#: ckanext/issues/controller/moderation.py:17 +#: ckanext/issues/controller/moderation.py:76 +msgid "Organization not found" +msgstr "" + +#: ckanext/issues/controller/moderation.py:22 +msgid "You must be logged in to moderate issues" +msgstr "" + +#: ckanext/issues/controller/moderation.py:29 +msgid "Issue permanently hidden" +msgstr "" + +#: ckanext/issues/controller/moderation.py:33 +msgid "All issue reports cleared" +msgstr "" + +#: ckanext/issues/controller/moderation.py:81 +msgid "You must be logged in to moderate comment" +msgstr "" + +#: ckanext/issues/controller/moderation.py:88 +msgid "Comment permanently hidden" +msgstr "" + +#: ckanext/issues/controller/moderation.py:92 +msgid "All comment reports cleared" +msgstr "" + +#: ckanext/issues/controller/show.py:18 +msgid "No description provided" +msgstr "" + +#: ckanext/issues/lib/helpers.py:202 +msgid "[{site_title} Issue] {dataset}" +msgstr "" + +#: ckanext/issues/logic/action/action.py:63 +msgid "Issue does not exist" +msgstr "" + +#: ckanext/issues/logic/action/action.py:83 +msgid "Issue marked as spam/abuse" +msgstr "" + +#: ckanext/issues/logic/action/action.py:554 +msgid "Issue has already been reported by this user" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:13 +msgid "{0} is not a valid status" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:44 +#: ckanext/issues/logic/validators/validators.py:55 +msgid "Not found" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:45 +msgid "Dataset" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:56 +msgid "Organization" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:65 +#: ckanext/issues/logic/validators/validators.py:78 +msgid "Issue not found" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:87 +msgid "Issue Comment not found" +msgstr "" + +#: ckanext/issues/public/scripts/autocomplete-action-api.js:31 +msgid "No matches found" +msgstr "" + +#: ckanext/issues/public/scripts/autocomplete-action-api.js:32 +msgid "Start typing…" +msgstr "" + +#: ckanext/issues/public/scripts/autocomplete-action-api.js:34 +msgid "Input is too short, must be at least one character" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:3 +#: ckanext/issues/templates/issues/add.html:5 +#: ckanext/issues/templates/issues/dataset.html:22 +msgid "New Issue" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:16 +#: ckanext/issues/templates/issues/edit.html:14 +msgid "The form contains invalid entries:" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:27 +#: ckanext/issues/templates/issues/edit.html:25 +msgid "Title" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:28 +#: ckanext/issues/templates/issues/edit.html:26 +msgid "Description" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:28 +#: ckanext/issues/templates/issues/edit.html:26 +msgid "Add a comment" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:33 +#: ckanext/issues/templates/issues/confirm_delete.html:14 +#: ckanext/issues/templates/issues/edit.html:34 +msgid "Cancel" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:35 +msgid "Create" +msgstr "" + +#: ckanext/issues/templates/issues/all_issues.html:5 +#: ckanext/issues/templates/issues/all_issues.html:12 +msgid "All Issues" +msgstr "" + +#: ckanext/issues/templates/issues/base.html:9 +msgid "Datasets" +msgstr "" + +#: ckanext/issues/templates/issues/base_form_page.html:14 +msgid "What are issues?" +msgstr "" + +#: ckanext/issues/templates/issues/base_form_page.html:16 +msgid "

Issues are ... .

" +msgstr "" + +#: ckanext/issues/templates/issues/comment_moderation.html:8 +#: ckanext/issues/templates/issues/moderation.html:8 +msgid "Reported issues" +msgstr "" + +#: ckanext/issues/templates/issues/comment_moderation.html:28 +#: ckanext/issues/templates/issues/moderation.html:28 +#: ckanext/issues/templates/issues/organization_issues.html:11 +msgid "Organizations" +msgstr "" + +#: ckanext/issues/templates/issues/comment_moderation.html:68 +#: ckanext/issues/templates/issues/moderation.html:69 +msgid "Not abuse" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:30 +#: ckanext/issues/templates/issues/organization_issues.html:76 +#, python-format +msgid "%s comments" +msgstr "" + +#: ckanext/issues/templates/issues/confirm_delete.html:3 +#: ckanext/issues/templates/issues/confirm_delete.html:15 +msgid "Confirm Delete" +msgstr "" + +#: ckanext/issues/templates/issues/confirm_delete.html:11 +msgid "Are you sure you want to delete issue - {0}?" +msgstr "" + +#: ckanext/issues/templates/issues/dataset.html:14 +#: ckanext/issues/templates/issues/dataset.html:20 +#: ckanext/issues/templates/issues/organization_issues.html:8 +#: ckanext/issues/templates/issues/organization_issues.html:22 +#: ckanext/issues/templates/issues/show.html:13 +msgid "Issues" +msgstr "" + +#: ckanext/issues/templates/issues/dataset.html:26 +#: ckanext/issues/templates/issues/organization_issues.html:27 +msgid "Search issues..." +msgstr "" + +#: ckanext/issues/templates/issues/dataset.html:28 +#: ckanext/issues/templates/issues/organization_issues.html:29 +#: ckanext/issues/templates/snippets/search_result_text.html:5 +msgid "{number} issue found" +msgid_plural "{number} issues found" +msgstr[0] "" +msgstr[1] "" + +#: ckanext/issues/templates/issues/dataset.html:38 +msgid "No issues" +msgstr "" + +#: ckanext/issues/templates/issues/edit.html:3 +#: ckanext/issues/templates/issues/edit.html:5 +msgid "Edit Issue" +msgstr "" + +#: ckanext/issues/templates/issues/edit.html:36 +msgid "Update" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:125 +msgid "Not spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:174 +msgid "{number} comment" +msgid_plural "{number} comments" +msgstr[0] "" +msgstr[1] "" + +#: ckanext/issues/templates/issues/show.html:208 +msgid "Are you sure you want to delete this issue?" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:209 +msgid "Delete" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:214 +msgid "Close" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:218 +msgid "Re-open" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:224 +msgid "Comment" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:231 +msgid "Login to comment" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:256 +msgid "This issue has been assigned to an administrator for the publisher" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:258 +msgid "No one" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:279 +msgid "Assign" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_comment.html:4 +#: ckanext/issues/templates/issues/email/new_issue.html:4 +msgid "The dataset is: " +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:2 +msgid "On" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:2 +msgid "a user has raised an issue with one of the datasets from organization" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:5 +msgid "The issue is:" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:10 +msgid "Please correct the problem or add an initial comment about the issue at: " +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:12 +msgid "Thank you," +msgstr "" + +#: ckanext/issues/templates/snippets/search_result_text.html:3 +msgid "{number} issue found for \"{query}\"" +msgid_plural "{number} issues found for \"{query}\"" +msgstr[0] "" +msgstr[1] "" + +#: ckanext/issues/templates/snippets/search_result_text.html:4 +msgid "No issues found for \"{query}\"" +msgstr "" + +#: ckanext/issues/templates/snippets/search_result_text.html:6 +msgid "No issues found" +msgstr "" + diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo new file mode 100644 index 0000000000000000000000000000000000000000..8cc18b9524cfc86609c23b988caebddc41a566f0 GIT binary patch literal 7475 zcmeI0TWnlM8Gwgg2z9uG-Y9J$la!=MlU=Xvs6-pvi5)xCU?;(`3y4cO-ZS=|c=w#m zIcMWKj@2fpfC{JxsE8={ONDr#p(s2=6cqs?LR>a#kq{CEaT7e0he+iC1mgSW%&ymN zLL$KfLXK>IXXgAf^Ur@fGkNa%YaUhno96d+en+pC*3!S@FIDQbG#BAo_(}K*_$Al@ zzX5N9--aUh3%DI#fZO2uHA?ZQ-U6?OaB@M(Ah{3E;- z{tdno-t@9;-ZwzH)He8P*aP`d!~BtT_e0Tp5{kYa?1mNiD)>1l>plTr4u1%5gwI0R z$DiRH@aF5X`HN8W7=rh7axekgx{cs&T z0&jvRA)@LO6#c&F+GnAx`+fL2_$-uh7og00HJg=j9Z>9aBisP*aQ(xs{{Xy-{`WxH zw+C;AAr${U1V`Y<;d=NhD0cn_l>J`IAkpJiDC^$^#s9lp|0F~uW!(E36g!-NGXIz1 zAbb)^9J~O<-+zZ1Za`=|9E4pkg0jCaK(WVHq0IL*?1aCAcf%XlwAk;>Q1p5)+zO9C zneQ>zJ_onZzTkKpo7qfz2o~Wid_8;|4#OWn+22|wm3244yWl-=A57qHUZT`lC~}Vx z?3hZOfvBdw3&kEkgAxb7gd+D>D0;0U$hW~hDEkZ`uT;&o-v`A`4@2?8N1@o^6wJZX zQ0(^{l|`SMmsh^vx&UxA``0!7~kU^jdiVgmIPly!ds zah3W5u}25 za1Rvw%|X%YBT(|?vry(c=h`no$(QvwMR*U~43EGfJOw3Ro`J*g0%R$*laI;{I1cx~ z55U9loP2C_Z>@hMN$MuiUTkzepV#@`&RV}#n-X1$s#O!Fi5l>I?KPWfpi>xCs#QF|*`PCo{k~H?xC~irM8sX6(38pGWRt}@M>Q%I?pXA%6oXk>R%^(?K>B_t=2flAY z#KY+zuIeFc5w$lqUTV~kmwJgwn`DVpPe=98Z}ue04Hz;>DGq9B5QS>k57NwGY9y@H zQ>=x4kxt6^YrC%26T5dW)p(BQC^WiM_F}J;nwTL+y-MI?gCj&qs;uX=Ghv$sS$|0k z>^mVpBCJG5b3fK{onln4!hZbu6~>*K*VdV0F(>@*ZJI5KOv|EKPt}WOaTW_DHLu#~ zO);aJaLHnsXscb6Xmdgr@kb^dn_N^gVQYg~$hRWCDI|GtiD1b@SW35oD+_u*pDms^ z@cyW=#}5^WDOSs? z{bo+v+0}l@%vL<e2hSUU~9+HlMBbzo2+fs-nc*j#q*0BMY`&xr83cxMK2u$ z9sQ}!oMoTtDFGTBvkUQ})fCk|TaiLkv>Mo<&AHNcw;u@Af%eU}H`=1Ny*p6{B@sx1 zD2`2u%2YP8X&g}1*x#-llI%emkl@Yw=S@ZAmdIL_w3iljbEZnus((Zf{eC>_LAm7RpC7lgKs*_@{&#eqqRRwUaMBWOup+S1;NV$YV|i$}e6zcpfg zsuCn+(t9FED@IL*E4*qa$x5bp*{<;-sbyaY$=a3E91WUrApy1`VXjDcS-woxFc->F zmZV7N6=ki}FSVp?Ke93j} zqd2Q+Z!1&T`66fYC%e@<`1Cf5K7mQ75zATRWa-!ZU|&K~Du;aIuT;1i`G!xW7BwIGChApwo0_;mp3(I@6PP^r$8ogY^73vi- z2jl24^)WZ%=kDc@L!=jVX_k}B{b|mvSIGBtWMwQjmdpfxZm>R+, 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: ckanext-issues 0.3\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2018-03-20 22:27+0000\n" +"PO-Revision-Date: 2018-03-20 22:22+0000\n" +"Last-Translator: FULL NAME \n" +"Language: uk_UA\n" +"Language-Team: uk_UA \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +#: ckanext/issues/auth.py:20 +msgid "User {0} not authorized for action on issue {1}" +msgstr "" + +#: ckanext/issues/auth.py:42 +msgid "User {0} not authorized for action" +msgstr "" + +#: ckanext/issues/auth.py:91 +msgid "User {user} not authorized for action on issue {issue}" +msgstr "" + +#: ckanext/issues/controller/controller.py:48 +msgid "Issues have not been enabled for this dataset" +msgstr "" + +#: ckanext/issues/controller/controller.py:51 +#: ckanext/issues/controller/controller.py:69 +msgid "Dataset not found" +msgstr "" + +#: ckanext/issues/controller/controller.py:54 +msgid "Unauthorized to view issues for this dataset" +msgstr "" + +#: ckanext/issues/controller/controller.py:66 +msgid "Issues have not been enabled for this organization" +msgstr "" + +#: ckanext/issues/controller/controller.py:72 +msgid "Unauthorized to view issues for this organization" +msgstr "" + +#: ckanext/issues/controller/controller.py:77 +msgid "Please login to add a new issue" +msgstr "" + +#: ckanext/issues/controller/controller.py:86 +msgid "Not authorized to add a new issue" +msgstr "" + +#: ckanext/issues/controller/controller.py:113 +msgid "Your issue has been registered, thank you for the feedback" +msgstr "" + +#: ckanext/issues/controller/controller.py:131 +#: ckanext/issues/controller/controller.py:134 +msgid "Issue not found: {0}" +msgstr "" + +#: ckanext/issues/controller/controller.py:178 +msgid "Invalid request" +msgstr "" + +#: ckanext/issues/controller/controller.py:190 +msgid "Not authorized" +msgstr "" + +#: ckanext/issues/controller/controller.py:199 +msgid "Comment cannot be empty" +msgstr "" + +#: ckanext/issues/controller/controller.py:215 +msgid "Issue closed" +msgstr "" + +#: ckanext/issues/controller/controller.py:217 +msgid "Issue re-opened" +msgstr "" + +#: ckanext/issues/controller/controller.py:255 +msgid "Unauthorized to delete issue {0}" +msgstr "" + +#: ckanext/issues/controller/controller.py:260 +msgid "Issue {0} has been deleted." +msgstr "" + +#: ckanext/issues/controller/controller.py:278 +msgid "User {0} does not exist" +msgstr "" + +#: ckanext/issues/controller/controller.py:298 +msgid "Assigned to {user}" +msgstr "" + +#: ckanext/issues/controller/controller.py:308 +msgid "Unauthorized to assign users to issue" +msgstr "" + +#: ckanext/issues/controller/controller.py:322 +msgid "You must be logged in to report issues" +msgstr "" + +#: ckanext/issues/controller/controller.py:333 +#: ckanext/issues/controller/controller.py:370 +msgid "Report acknowledged." +msgstr "" + +#: ckanext/issues/controller/controller.py:336 +#: ckanext/issues/controller/controller.py:373 +msgid "Marked as abuse/spam." +msgstr "" + +#: ckanext/issues/controller/controller.py:337 +msgid "Issue is visible." +msgstr "" + +#: ckanext/issues/controller/controller.py:339 +msgid "Issue is invisible to normal users." +msgstr "" + +#: ckanext/issues/controller/controller.py:342 +msgid "Issue reported to an administrator" +msgstr "" + +#: ckanext/issues/controller/controller.py:358 +msgid "You must be logged in to report comments" +msgstr "" + +#: ckanext/issues/controller/controller.py:374 +msgid "Comment is visible." +msgstr "" + +#: ckanext/issues/controller/controller.py:376 +msgid "Comment is invisible to normal users." +msgstr "" + +#: ckanext/issues/controller/controller.py:379 +msgid "Comment has been reported to an administrator" +msgstr "" + +#: ckanext/issues/controller/controller.py:402 +msgid "Issue report cleared" +msgstr "" + +#: ckanext/issues/controller/controller.py:407 +msgid "You must be logged in clear abuse reports" +msgstr "" + +#: ckanext/issues/controller/controller.py:425 +msgid "Spam/abuse report cleared" +msgstr "" + +#: ckanext/issues/controller/controller.py:430 +msgid "You must be logged in to clear abuse reports" +msgstr "" + +#: ckanext/issues/controller/controller.py:447 +#: ckanext/issues/controller/controller.py:487 +msgid "Validation error: {0}" +msgstr "" + +#: ckanext/issues/controller/moderation.py:17 +#: ckanext/issues/controller/moderation.py:76 +msgid "Organization not found" +msgstr "" + +#: ckanext/issues/controller/moderation.py:22 +msgid "You must be logged in to moderate issues" +msgstr "" + +#: ckanext/issues/controller/moderation.py:29 +msgid "Issue permanently hidden" +msgstr "" + +#: ckanext/issues/controller/moderation.py:33 +msgid "All issue reports cleared" +msgstr "" + +#: ckanext/issues/controller/moderation.py:81 +msgid "You must be logged in to moderate comment" +msgstr "" + +#: ckanext/issues/controller/moderation.py:88 +msgid "Comment permanently hidden" +msgstr "" + +#: ckanext/issues/controller/moderation.py:92 +msgid "All comment reports cleared" +msgstr "" + +#: ckanext/issues/controller/show.py:18 +msgid "No description provided" +msgstr "" + +#: ckanext/issues/lib/helpers.py:202 +msgid "[{site_title} Issue] {dataset}" +msgstr "" + +#: ckanext/issues/logic/action/action.py:63 +msgid "Issue does not exist" +msgstr "" + +#: ckanext/issues/logic/action/action.py:83 +msgid "Issue marked as spam/abuse" +msgstr "" + +#: ckanext/issues/logic/action/action.py:554 +msgid "Issue has already been reported by this user" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:13 +msgid "{0} is not a valid status" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:44 +#: ckanext/issues/logic/validators/validators.py:55 +msgid "Not found" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:45 +msgid "Dataset" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:56 +msgid "Organization" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:65 +#: ckanext/issues/logic/validators/validators.py:78 +msgid "Issue not found" +msgstr "" + +#: ckanext/issues/logic/validators/validators.py:87 +msgid "Issue Comment not found" +msgstr "" + +#: ckanext/issues/public/scripts/autocomplete-action-api.js:31 +msgid "No matches found" +msgstr "" + +#: ckanext/issues/public/scripts/autocomplete-action-api.js:32 +msgid "Start typing…" +msgstr "" + +#: ckanext/issues/public/scripts/autocomplete-action-api.js:34 +msgid "Input is too short, must be at least one character" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:3 +#: ckanext/issues/templates/issues/add.html:5 +#: ckanext/issues/templates/issues/dataset.html:22 +msgid "New Issue" +msgstr "Нова скарга" + +#: ckanext/issues/templates/issues/add.html:16 +#: ckanext/issues/templates/issues/edit.html:14 +msgid "The form contains invalid entries:" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:27 +#: ckanext/issues/templates/issues/edit.html:25 +msgid "Title" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:28 +#: ckanext/issues/templates/issues/edit.html:26 +msgid "Description" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:28 +#: ckanext/issues/templates/issues/edit.html:26 +msgid "Add a comment" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:33 +#: ckanext/issues/templates/issues/confirm_delete.html:14 +#: ckanext/issues/templates/issues/edit.html:34 +msgid "Cancel" +msgstr "" + +#: ckanext/issues/templates/issues/add.html:35 +msgid "Create" +msgstr "" + +#: ckanext/issues/templates/issues/all_issues.html:5 +#: ckanext/issues/templates/issues/all_issues.html:12 +msgid "All Issues" +msgstr "" + +#: ckanext/issues/templates/issues/base.html:9 +msgid "Datasets" +msgstr "" + +#: ckanext/issues/templates/issues/base_form_page.html:14 +msgid "What are issues?" +msgstr "" + +#: ckanext/issues/templates/issues/base_form_page.html:16 +msgid "

Issues are ... .

" +msgstr "" + +#: ckanext/issues/templates/issues/comment_moderation.html:8 +#: ckanext/issues/templates/issues/moderation.html:8 +msgid "Reported issues" +msgstr "" + +#: ckanext/issues/templates/issues/comment_moderation.html:28 +#: ckanext/issues/templates/issues/moderation.html:28 +#: ckanext/issues/templates/issues/organization_issues.html:11 +msgid "Organizations" +msgstr "" + +#: ckanext/issues/templates/issues/comment_moderation.html:68 +#: ckanext/issues/templates/issues/moderation.html:69 +msgid "Not abuse" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:30 +#: ckanext/issues/templates/issues/organization_issues.html:76 +#, python-format +msgid "%s comments" +msgstr "" + +#: ckanext/issues/templates/issues/confirm_delete.html:3 +#: ckanext/issues/templates/issues/confirm_delete.html:15 +msgid "Confirm Delete" +msgstr "" + +#: ckanext/issues/templates/issues/confirm_delete.html:11 +msgid "Are you sure you want to delete issue - {0}?" +msgstr "" + +#: ckanext/issues/templates/issues/dataset.html:14 +#: ckanext/issues/templates/issues/dataset.html:20 +#: ckanext/issues/templates/issues/organization_issues.html:8 +#: ckanext/issues/templates/issues/organization_issues.html:22 +#: ckanext/issues/templates/issues/show.html:13 +msgid "Issues" +msgstr "" + +#: ckanext/issues/templates/issues/dataset.html:26 +#: ckanext/issues/templates/issues/organization_issues.html:27 +msgid "Search issues..." +msgstr "" + +#: ckanext/issues/templates/issues/dataset.html:28 +#: ckanext/issues/templates/issues/organization_issues.html:29 +#: ckanext/issues/templates/snippets/search_result_text.html:5 +msgid "{number} issue found" +msgid_plural "{number} issues found" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ckanext/issues/templates/issues/dataset.html:38 +msgid "No issues" +msgstr "" + +#: ckanext/issues/templates/issues/edit.html:3 +#: ckanext/issues/templates/issues/edit.html:5 +msgid "Edit Issue" +msgstr "" + +#: ckanext/issues/templates/issues/edit.html:36 +msgid "Update" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:125 +msgid "Not spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:174 +msgid "{number} comment" +msgid_plural "{number} comments" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ckanext/issues/templates/issues/show.html:208 +msgid "Are you sure you want to delete this issue?" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:209 +msgid "Delete" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:214 +msgid "Close" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:218 +msgid "Re-open" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:224 +msgid "Comment" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:231 +msgid "Login to comment" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:256 +msgid "This issue has been assigned to an administrator for the publisher" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:258 +msgid "No one" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:279 +msgid "Assign" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_comment.html:4 +#: ckanext/issues/templates/issues/email/new_issue.html:4 +msgid "The dataset is: " +msgstr "Датасет це" + +#: ckanext/issues/templates/issues/email/new_issue.html:2 +msgid "On" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:2 +msgid "a user has raised an issue with one of the datasets from organization" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:5 +msgid "The issue is:" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:10 +msgid "Please correct the problem or add an initial comment about the issue at: " +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:12 +msgid "Thank you," +msgstr "" + +#: ckanext/issues/templates/snippets/search_result_text.html:3 +msgid "{number} issue found for \"{query}\"" +msgid_plural "{number} issues found for \"{query}\"" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ckanext/issues/templates/snippets/search_result_text.html:4 +msgid "No issues found for \"{query}\"" +msgstr "" + +#: ckanext/issues/templates/snippets/search_result_text.html:6 +msgid "No issues found" +msgstr "" + diff --git a/ckanext/issues/plugin.py b/ckanext/issues/plugin.py index e3688bc9..9b8ed1d5 100644 --- a/ckanext/issues/plugin.py +++ b/ckanext/issues/plugin.py @@ -10,7 +10,17 @@ # Imports are done in methods to speed up paster. # Please don't move back up to here. -class IssuesPlugin(p.SingletonPlugin): +if toolkit.check_ckan_version(min_version='2.5'): + from ckan.lib.plugins import DefaultTranslation + + class IssuesPluginBase(p.SingletonPlugin, DefaultTranslation): + p.implements(p.ITranslation, inherit=True) +else: + class IssuesPluginBase(p.SingletonPlugin): + pass + + +class IssuesPlugin(IssuesPluginBase): """ CKAN Issues Extension """ diff --git a/ckanext/issues/templates/issues/email/new_comment.html b/ckanext/issues/templates/issues/email/new_comment.html index 7c966e0e..67dd2246 100644 --- a/ckanext/issues/templates/issues/email/new_comment.html +++ b/ckanext/issues/templates/issues/email/new_comment.html @@ -1,7 +1,7 @@ A user '{{ user.fullname }}' has added a comment to one of your issues on {{ site_title }}. -The dataset is: {{ dataset.title }} +{% trans %}The dataset is: {% endtrans %}{{ dataset.title }} The issue is: {{ issue_subject }} The comment is: diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html index 12eedb38..64958d81 100644 --- a/ckanext/issues/templates/issues/email/new_issue.html +++ b/ckanext/issues/templates/issues/email/new_issue.html @@ -1,19 +1,20 @@ -On {{ site_title }} a user has raised an issue with one of the datasets from organization '{{ recipient.organization_title }}', for which you are an {{ recipient.capacity }}.' for which you are an {{ capacity }}. -The dataset is: {{ dataset.title }} -The issue is: +{% trans %}On{% endtrans %} {{ site_title }} {% trans %}a user has raised an issue with one of the datasets from organization{% endtrans %} '{{ recipient.organization_title }}', for which you are an {{ recipient.capacity }}.' for which you are an {{ capacity }}. + +{% trans %}The dataset is: {% endtrans %}{{ dataset.title }} +{% trans %}The issue is:{% endtrans %} > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. +{% trans %}Please correct the problem or add an initial comment about the issue at: {% endtrans %}{{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. -Thank you, +{% trans %}Thank you,{% endtrans %} -The {{ site_title }} team +{% trans %}The{% endtrans %} {{ site_title }} {% trans %}team{% endtrans %} -- -Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} -User: {{ user.fullname or user.name }} \ No newline at end of file +{% trans %}Issue:{% endtrans %} {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +{% trans %}Dataset:{% endtrans %} {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +{% trans %}User:{% endtrans %} {{ user.fullname or user.name }} \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index a7aa1543..f1afd8b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,27 @@ [nosetests] with-pylons=test.ini + +[extract_messages] +keywords = translate isPlural +add_comments = TRANSLATORS: +output_file = ckanext/issues/i18n/ckanext-issues.pot +width = 80 + +[init_catalog] +domain = ckanext-issues +input_file = ckanext/issues/i18n/ckanext-issues.pot +output_dir = ckanext/issues/i18n + +[update_catalog] +domain = ckanext-issues +input_file = ckanext/issues/i18n/ckanext-issues.pot +output_dir = ckanext/issues/i18n +previous = true + +[compile_catalog] +domain = ckanext-issues +directory = ckanext/issues/i18n +statistics = true + +[upload_sphinx] +upload-dir = build/sphinx/html \ No newline at end of file diff --git a/setup.py b/setup.py index 24a48784..b5b5b103 100644 --- a/setup.py +++ b/setup.py @@ -30,5 +30,20 @@ [paste.paster_command] issues = ckanext.issues.commands:Issues + + [babel.extractors] + ckan = ckan.lib.extract:extract_ckan """, + # If you are changing from the default layout of your extension, you may + # have to change the message extractors, you can read more about babel + # message extraction at + # http://babel.pocoo.org/docs/messages/#extraction-method-mapping-and-configuration + message_extractors={ + 'ckanext': [ + ('**.py', 'python', None), + ('**.js', 'javascript', None), + ('**/templates/**.html', 'ckan', None), + ], + } ) + From 181889ef1afdaa488bba58a3c40018f5a2b16cb4 Mon Sep 17 00:00:00 2001 From: ivankin Date: Mon, 26 Mar 2018 12:14:38 +0000 Subject: [PATCH 03/29] add translations --- .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 317 ++++++++++++------ 1 file changed, 209 insertions(+), 108 deletions(-) diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po index ac8afd50..011c091b 100644 --- a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po +++ b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-issues 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-03-20 22:27+0000\n" +"POT-Creation-Date: 2018-03-23 03:51+0000\n" "PO-Revision-Date: 2018-03-20 22:22+0000\n" "Last-Translator: FULL NAME \n" "Language: uk_UA\n" @@ -22,243 +22,325 @@ msgstr "" #: ckanext/issues/auth.py:20 msgid "User {0} not authorized for action on issue {1}" -msgstr "" +msgstr "Користувач {0} не авторизований для роботи" + + + + + #: ckanext/issues/auth.py:42 msgid "User {0} not authorized for action" -msgstr "" +msgstr "Користувач {0} не авторизований для роботи" + + #: ckanext/issues/auth.py:91 msgid "User {user} not authorized for action on issue {issue}" -msgstr "" +msgstr "Користувач {user} не авторизований для роботи зі скаргами {issue}" + + + #: ckanext/issues/controller/controller.py:48 msgid "Issues have not been enabled for this dataset" -msgstr "" +msgstr "Скарги недоступні для цього набору даних" + + #: ckanext/issues/controller/controller.py:51 #: ckanext/issues/controller/controller.py:69 msgid "Dataset not found" -msgstr "" +msgstr "Набір даних не знайдено" + + #: ckanext/issues/controller/controller.py:54 msgid "Unauthorized to view issues for this dataset" -msgstr "" +msgstr "Немає доступу для перегляду скарг на цей набір даних" + + #: ckanext/issues/controller/controller.py:66 msgid "Issues have not been enabled for this organization" -msgstr "" +msgstr "Скарги недоступні для цієї організації" + #: ckanext/issues/controller/controller.py:72 msgid "Unauthorized to view issues for this organization" -msgstr "" +msgstr "Немає доступу для перегляду скарг на цю організацію" + #: ckanext/issues/controller/controller.py:77 msgid "Please login to add a new issue" -msgstr "" +msgstr "Будь ласка, увійдіть, щоб додати нову скаргу" + #: ckanext/issues/controller/controller.py:86 msgid "Not authorized to add a new issue" -msgstr "" +msgstr "Немає доступу для додавання нової скарги" + + + #: ckanext/issues/controller/controller.py:113 msgid "Your issue has been registered, thank you for the feedback" -msgstr "" +msgstr "Ваша скарга була зареєстрована, дякуємо за зворотній зв'язок" + + #: ckanext/issues/controller/controller.py:131 #: ckanext/issues/controller/controller.py:134 msgid "Issue not found: {0}" -msgstr "" +msgstr "Скарга не знайдена : {0}" + + #: ckanext/issues/controller/controller.py:178 msgid "Invalid request" -msgstr "" +msgstr "Запит невірний" + + #: ckanext/issues/controller/controller.py:190 msgid "Not authorized" -msgstr "" +msgstr "Немає доступу" + #: ckanext/issues/controller/controller.py:199 msgid "Comment cannot be empty" -msgstr "" +msgstr "Поле \"Комментар\" не може бути порожнім" + + #: ckanext/issues/controller/controller.py:215 msgid "Issue closed" -msgstr "" +msgstr "Скарга закрита" + + #: ckanext/issues/controller/controller.py:217 msgid "Issue re-opened" -msgstr "" +msgstr "Скарга знову відкрита" + + #: ckanext/issues/controller/controller.py:255 msgid "Unauthorized to delete issue {0}" -msgstr "" +msgstr "Немає доступу, щоб видалити скаргу {0}" + + #: ckanext/issues/controller/controller.py:260 msgid "Issue {0} has been deleted." -msgstr "" +msgstr "Скарга {0} була видалена" + + #: ckanext/issues/controller/controller.py:278 msgid "User {0} does not exist" -msgstr "" +msgstr "Користувача {0} не існує" + + #: ckanext/issues/controller/controller.py:298 msgid "Assigned to {user}" -msgstr "" +msgstr "Закріплена за {user}" + + #: ckanext/issues/controller/controller.py:308 msgid "Unauthorized to assign users to issue" -msgstr "" +msgstr "Немає доступу для закріплення користувачів до скарги" + + #: ckanext/issues/controller/controller.py:322 msgid "You must be logged in to report issues" -msgstr "" +msgstr "Ви повинні увійти, щоб подати скарги" + + #: ckanext/issues/controller/controller.py:333 #: ckanext/issues/controller/controller.py:370 msgid "Report acknowledged." -msgstr "" +msgstr "Звіт підтверджено" + + #: ckanext/issues/controller/controller.py:336 #: ckanext/issues/controller/controller.py:373 msgid "Marked as abuse/spam." -msgstr "" +msgstr "Позначено як образу/спам" + + #: ckanext/issues/controller/controller.py:337 msgid "Issue is visible." -msgstr "" +msgstr "Скарга видима" + + #: ckanext/issues/controller/controller.py:339 msgid "Issue is invisible to normal users." -msgstr "" +msgstr "Скарга невидима для простих користувачів" + + #: ckanext/issues/controller/controller.py:342 msgid "Issue reported to an administrator" -msgstr "" +msgstr "Скарга була направлена до адміністратора" + + #: ckanext/issues/controller/controller.py:358 msgid "You must be logged in to report comments" -msgstr "" +msgstr "Ви повинні бути авторизовані, щоб поскаржитися на коментар" + + #: ckanext/issues/controller/controller.py:374 msgid "Comment is visible." -msgstr "" +msgstr "Коментар видимий" + + #: ckanext/issues/controller/controller.py:376 msgid "Comment is invisible to normal users." -msgstr "" +msgstr "Коментар невидимий для простих користувачів" + + #: ckanext/issues/controller/controller.py:379 msgid "Comment has been reported to an administrator" -msgstr "" +msgstr "Коментар був направлений до адміністратора" + + #: ckanext/issues/controller/controller.py:402 msgid "Issue report cleared" -msgstr "" +msgstr "Скарга була розглянута" + + #: ckanext/issues/controller/controller.py:407 msgid "You must be logged in clear abuse reports" -msgstr "" +msgstr "Ви повинні бути авторизовані, щоб розглянути скаргу" + + #: ckanext/issues/controller/controller.py:425 msgid "Spam/abuse report cleared" -msgstr "" +msgstr "Спам/скарга на образу були розглянуті" + + #: ckanext/issues/controller/controller.py:430 msgid "You must be logged in to clear abuse reports" -msgstr "" +msgstr "Ви повинні бути авторизовані, щоб розглянути скаргу" + + + #: ckanext/issues/controller/controller.py:447 #: ckanext/issues/controller/controller.py:487 msgid "Validation error: {0}" -msgstr "" +msgstr "Помилка перевірки: {0}" + + #: ckanext/issues/controller/moderation.py:17 #: ckanext/issues/controller/moderation.py:76 msgid "Organization not found" -msgstr "" +msgstr "Організація не знайдена" + + #: ckanext/issues/controller/moderation.py:22 msgid "You must be logged in to moderate issues" -msgstr "" +msgstr "Ви повинні бути авторизовані, щоб модерувати скарги" + + #: ckanext/issues/controller/moderation.py:29 msgid "Issue permanently hidden" -msgstr "" +msgstr "Скаргу приховано назавжди" + + #: ckanext/issues/controller/moderation.py:33 msgid "All issue reports cleared" -msgstr "" +msgstr "Усі скарги розглянуті" #: ckanext/issues/controller/moderation.py:81 msgid "You must be logged in to moderate comment" -msgstr "" +msgstr "Ви повинні авторизуватися для модеруваня коментаря" #: ckanext/issues/controller/moderation.py:88 msgid "Comment permanently hidden" -msgstr "" +msgstr "Коментар приховано назавжди" #: ckanext/issues/controller/moderation.py:92 msgid "All comment reports cleared" -msgstr "" +msgstr "Всі коментарі до скарг розглянуто" #: ckanext/issues/controller/show.py:18 msgid "No description provided" -msgstr "" +msgstr "Опису немає" #: ckanext/issues/lib/helpers.py:202 msgid "[{site_title} Issue] {dataset}" -msgstr "" +msgstr "[{site_title} Скарга] {dataset}" #: ckanext/issues/logic/action/action.py:63 msgid "Issue does not exist" -msgstr "" +msgstr "Скарги не існує" #: ckanext/issues/logic/action/action.py:83 msgid "Issue marked as spam/abuse" -msgstr "" +msgstr "Скарга помічена як спам/образа" #: ckanext/issues/logic/action/action.py:554 msgid "Issue has already been reported by this user" -msgstr "" +msgstr "Скарга вже була подана цим користувачем" #: ckanext/issues/logic/validators/validators.py:13 msgid "{0} is not a valid status" -msgstr "" +msgstr "{0} невірний статус" #: ckanext/issues/logic/validators/validators.py:44 #: ckanext/issues/logic/validators/validators.py:55 msgid "Not found" -msgstr "" +msgstr "Не знайдено" #: ckanext/issues/logic/validators/validators.py:45 msgid "Dataset" -msgstr "" +msgstr "Набір даних" #: ckanext/issues/logic/validators/validators.py:56 msgid "Organization" -msgstr "" +msgstr "Організація" #: ckanext/issues/logic/validators/validators.py:65 #: ckanext/issues/logic/validators/validators.py:78 msgid "Issue not found" -msgstr "" +msgstr "Скарга не знайдена" #: ckanext/issues/logic/validators/validators.py:87 msgid "Issue Comment not found" -msgstr "" +msgstr "Коментар до скарги не знайдений" #: ckanext/issues/public/scripts/autocomplete-action-api.js:31 msgid "No matches found" -msgstr "" +msgstr "Співпадінь немає" #: ckanext/issues/public/scripts/autocomplete-action-api.js:32 -msgid "Start typing…" -msgstr "" +msgid "Start typing…" +msgstr "Почати" #: ckanext/issues/public/scripts/autocomplete-action-api.js:34 msgid "Input is too short, must be at least one character" -msgstr "" +msgstr "Ввід занадто короткий, має бути щонайменьше один знак" #: ckanext/issues/templates/issues/add.html:3 #: ckanext/issues/templates/issues/add.html:5 @@ -269,80 +351,80 @@ msgstr "Нова скарга" #: ckanext/issues/templates/issues/add.html:16 #: ckanext/issues/templates/issues/edit.html:14 msgid "The form contains invalid entries:" -msgstr "" +msgstr "Форма містить неправильні знаки" #: ckanext/issues/templates/issues/add.html:27 #: ckanext/issues/templates/issues/edit.html:25 msgid "Title" -msgstr "" +msgstr "Назва" #: ckanext/issues/templates/issues/add.html:28 #: ckanext/issues/templates/issues/edit.html:26 msgid "Description" -msgstr "" +msgstr "Опис" #: ckanext/issues/templates/issues/add.html:28 #: ckanext/issues/templates/issues/edit.html:26 msgid "Add a comment" -msgstr "" +msgstr "Додати коментар" #: ckanext/issues/templates/issues/add.html:33 #: ckanext/issues/templates/issues/confirm_delete.html:14 #: ckanext/issues/templates/issues/edit.html:34 msgid "Cancel" -msgstr "" +msgstr "Видалити" #: ckanext/issues/templates/issues/add.html:35 msgid "Create" -msgstr "" +msgstr "Створити" #: ckanext/issues/templates/issues/all_issues.html:5 #: ckanext/issues/templates/issues/all_issues.html:12 msgid "All Issues" -msgstr "" +msgstr "Всі скарги" #: ckanext/issues/templates/issues/base.html:9 msgid "Datasets" -msgstr "" +msgstr "Набори даних" #: ckanext/issues/templates/issues/base_form_page.html:14 msgid "What are issues?" -msgstr "" +msgstr "Що таке скарги?" #: ckanext/issues/templates/issues/base_form_page.html:16 msgid "

Issues are ... .

" -msgstr "" +msgstr "

Скари – це ... .

" #: ckanext/issues/templates/issues/comment_moderation.html:8 #: ckanext/issues/templates/issues/moderation.html:8 msgid "Reported issues" -msgstr "" +msgstr "Подані скарги" #: ckanext/issues/templates/issues/comment_moderation.html:28 #: ckanext/issues/templates/issues/moderation.html:28 #: ckanext/issues/templates/issues/organization_issues.html:11 msgid "Organizations" -msgstr "" +msgstr "Організації" #: ckanext/issues/templates/issues/comment_moderation.html:68 #: ckanext/issues/templates/issues/moderation.html:69 msgid "Not abuse" -msgstr "" +msgstr "Не образа" #: ckanext/issues/templates/issues/common.html:30 #: ckanext/issues/templates/issues/organization_issues.html:76 #, python-format msgid "%s comments" -msgstr "" +msgstr "%s коментарі" #: ckanext/issues/templates/issues/confirm_delete.html:3 #: ckanext/issues/templates/issues/confirm_delete.html:15 msgid "Confirm Delete" -msgstr "" +msgstr "Підтвердити видалення" #: ckanext/issues/templates/issues/confirm_delete.html:11 msgid "Are you sure you want to delete issue - {0}?" -msgstr "" +msgstr "Ви впевнені, що хочете видалити скаргу - {0}?" #: ckanext/issues/templates/issues/dataset.html:14 #: ckanext/issues/templates/issues/dataset.html:20 @@ -350,119 +432,138 @@ msgstr "" #: ckanext/issues/templates/issues/organization_issues.html:22 #: ckanext/issues/templates/issues/show.html:13 msgid "Issues" -msgstr "" +msgstr "Скарги" #: ckanext/issues/templates/issues/dataset.html:26 #: ckanext/issues/templates/issues/organization_issues.html:27 msgid "Search issues..." -msgstr "" +msgstr "Шукати скарги..." #: ckanext/issues/templates/issues/dataset.html:28 #: ckanext/issues/templates/issues/organization_issues.html:29 #: ckanext/issues/templates/snippets/search_result_text.html:5 msgid "{number} issue found" msgid_plural "{number} issues found" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{number} скарг знайдено" +msgstr[1] "{number} скарг знайдено" +msgstr[2] "{number} скарг знайдено" #: ckanext/issues/templates/issues/dataset.html:38 msgid "No issues" -msgstr "" +msgstr "Скарг немає" #: ckanext/issues/templates/issues/edit.html:3 #: ckanext/issues/templates/issues/edit.html:5 msgid "Edit Issue" -msgstr "" +msgstr "Редагувати скаргу" #: ckanext/issues/templates/issues/edit.html:36 msgid "Update" -msgstr "" +msgstr "Оновити" #: ckanext/issues/templates/issues/show.html:125 msgid "Not spam/abuse" -msgstr "" +msgstr "Не спам/образа" #: ckanext/issues/templates/issues/show.html:174 msgid "{number} comment" msgid_plural "{number} comments" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{number} комментарів" +msgstr[1] "{number} комментарів" +msgstr[2] "{number} комментарів" #: ckanext/issues/templates/issues/show.html:208 msgid "Are you sure you want to delete this issue?" -msgstr "" +msgstr "Ви впевнені, що хочете видалити цю скаргу?" #: ckanext/issues/templates/issues/show.html:209 msgid "Delete" -msgstr "" +msgstr "Видалити" #: ckanext/issues/templates/issues/show.html:214 msgid "Close" -msgstr "" +msgstr "Закрити" #: ckanext/issues/templates/issues/show.html:218 msgid "Re-open" -msgstr "" +msgstr "Відкрити знову" #: ckanext/issues/templates/issues/show.html:224 msgid "Comment" -msgstr "" +msgstr "Коментар" #: ckanext/issues/templates/issues/show.html:231 msgid "Login to comment" -msgstr "" +msgstr "Увійдіть, щоб коментувати" #: ckanext/issues/templates/issues/show.html:256 msgid "This issue has been assigned to an administrator for the publisher" -msgstr "" +msgstr "Ця скарга була закріплена за адміністратором розпорядника" #: ckanext/issues/templates/issues/show.html:258 msgid "No one" -msgstr "" +msgstr "Нікого" #: ckanext/issues/templates/issues/show.html:279 msgid "Assign" -msgstr "" +msgstr "Закріпити" #: ckanext/issues/templates/issues/email/new_comment.html:4 #: ckanext/issues/templates/issues/email/new_issue.html:4 msgid "The dataset is: " -msgstr "Датасет це" +msgstr "Набір даних: " #: ckanext/issues/templates/issues/email/new_issue.html:2 msgid "On" -msgstr "" +msgstr "Вкл" #: ckanext/issues/templates/issues/email/new_issue.html:2 msgid "a user has raised an issue with one of the datasets from organization" -msgstr "" +msgstr "користувач почав обговорення набору даних організації" #: ckanext/issues/templates/issues/email/new_issue.html:5 msgid "The issue is:" -msgstr "" +msgstr "Скарга: " #: ckanext/issues/templates/issues/email/new_issue.html:10 msgid "Please correct the problem or add an initial comment about the issue at: " -msgstr "" +msgstr "Будь ласка вирішіть проблему чи додайте перший коментар до скарги: " #: ckanext/issues/templates/issues/email/new_issue.html:12 msgid "Thank you," +msgstr "Дякуємо," + +#: ckanext/issues/templates/issues/email/new_issue.html:14 +msgid "The" msgstr "" +#: ckanext/issues/templates/issues/email/new_issue.html:14 +msgid "team" +msgstr "команда" + +#: ckanext/issues/templates/issues/email/new_issue.html:18 +msgid "Issue:" +msgstr "Скарга:" + +#: ckanext/issues/templates/issues/email/new_issue.html:19 +msgid "Dataset:" +msgstr "Набір даних:" + +#: ckanext/issues/templates/issues/email/new_issue.html:20 +msgid "User:" +msgstr "Користувач:" + #: ckanext/issues/templates/snippets/search_result_text.html:3 msgid "{number} issue found for \"{query}\"" msgid_plural "{number} issues found for \"{query}\"" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{number} скарг знайдено по \"{query}\" +msgstr[1] "{number} скарг знайдено по \"{query}\" +msgstr[2] "{number} скарг знайдено по \"{query}\" #: ckanext/issues/templates/snippets/search_result_text.html:4 msgid "No issues found for \"{query}\"" -msgstr "" +msgstr "Скарги на \"{query}\" не знайдені" #: ckanext/issues/templates/snippets/search_result_text.html:6 msgid "No issues found" -msgstr "" - +msgstr "Скарги не знайдені" From f8c89f09ba02bd1c66c7ffbc5ab41cb64de705ad Mon Sep 17 00:00:00 2001 From: ivankin Date: Mon, 26 Mar 2018 12:17:11 +0000 Subject: [PATCH 04/29] add translations --- .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo | Bin 7475 -> 10073 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo index 8cc18b9524cfc86609c23b988caebddc41a566f0..954acacf0fcf7cd73df601a1e6f750580b31781b 100644 GIT binary patch literal 10073 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 delta 1836 zcmY+_TWC~A9LMqhiJHVD#uGKsYTB&vT9Y((4JunIvKY~-5pU3kQW{Fysv$9z5|oBx zQmhg!7Pr!%t=B5zgGLWg2rBVX8q(X@YD-(umR|M2J}lUW7Ny@GJ0M-o?q|-NIWzzH z&kXxRLzoEej2XVq_`JrqobU2sx_kV2JJ;+9Zac6LKg3aZ3=8lqPQr_*cHd()X0Qq? z^2{jOG8}`e-F*{|Fbk}i0++qX&v@L5HMke2;Q)@sKX4-cgT+{ypY3=mQe{iN;Y4XD7^p#pBiI5y*G#&AbuIum!co+i@wTumW$RQvDD$;}N{1KqjIB zn1$K{&$;?_NKDq`o^L{Bq7&8sCq?8xN#Pt7YzBLPTJwJ~hLdSkjY)hKTTwGSg38EA zREGmti@)Mr9Luzo!52`0y@F3;8>+tp?tZYC{LiE!Lxr5gbf)7XOyEX*3Qu4?eu|o5 zA-!tgX*dg);9}g2KYM2VsCEa~@+8apkl5@BDkEQ`_QH<=1vUH|6`9Xgufpe1GhL57 zvQ6&(9aN^eQA_bYDib|egT1H>-a#%K&N^wcPC({pb5Q*zQSS#!Dd^a&LN>a+>KZho zBHxUPIKVh|BT2AJsDZykR?B`zF3a$viR6)gotipS|1Y8f*?@X~JJK|;eH3(TPPqry zvJdPAD#dqEsVZb=D)JeqnLdLG=p`iEwg+iyhn?q90e*ox4ZooV{tI<#9-*)EUrsA^ zT!U&@hf37~)UjFN>RVm?7R;f3Cu-)qkiM)3wZ>;qr{)ss)Z{TcrFsS`L$#|0cS z_c5rY;IlAuaUm*&?WmN#hdMR~Q5_Dt`v<7gQo*{&B{&`1Fo8X&Q*#6BF@ua{^ZA3R z!_~MDca)Qu4HO2;!=c=7yzqGbRWEEQSd&xy%eE7?_Kn7tjj=7QZ&ioi72Wc}3&mHw zu){C&@@B{4@kD%HxWA;`3)8uuXWvY<6m*wHA4iv?b5Uqz3FXH81;r;;ec29 s|2{4HfX7{YJEOjIS1kQ*)EE9)G?X1D)!{Ero%NHc+y2T_e#zAT0FY(b`v3p{ From e1f18fb8f827b4f290149eda66ee7f8b0c13f79c Mon Sep 17 00:00:00 2001 From: ivankin Date: Tue, 27 Mar 2018 05:34:19 +0000 Subject: [PATCH 05/29] change translations --- .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo | Bin 10073 -> 10075 bytes .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo index 954acacf0fcf7cd73df601a1e6f750580b31781b..d992f9c2512f9846ef36371bd704b639a33722bc 100644 GIT binary patch delta 377 zcmXZXKT88a5QpI(h)O~*h3G{zMvYo%r4|A064J?eU}dEUcK#_X6fTWmr=W#kW4?jm z6hpwIuo6@zW$;S~hhXWu~BB*jzG8D{cQfR{LlJ)Ff~oIr0{ zB2_C`MISSGi&?DW05;IWXWYO~9KlpUI>a2N@uHwm`)sZWR4~RpEX_!}c!%!cA1>iA z(`@2uVu(kaKX44!=cGjp(0$+(U7ef6IB~n!k4MF={zRkmQkldWp5PlU;2O&T?w}i_ tgY?oDy23wri~(Km-F@^vv^?%TSleE#W9@FOdu31dYE5fdGfL%y^gqY|K12Wj delta 359 zcmXZXKTASU7{~FShzZv)0=*$>mS#f^)gTCNiJM%nQ)42u^=E2IyF=h8WKe@cFG1tZ z4UJ~IMDHPxz}fG?yPVHC&vVZ6Jm=T>aVFh}XG{9eNcU)EB^Udc#yRerJf<+YD{)oF zSjPr#;t;p+4Z}Fb9rUq^GmK+2Ctab97Cz?Wsl#SKpoR-5PjHc#EG{#8Z|_JV!Ig2hvO5 cXbS(~4LWoknY=&UDA~`GOd|B^$Fi=q0%S2RxBvhE diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po index 011c091b..b702d01b 100644 --- a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po +++ b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po @@ -404,7 +404,7 @@ msgstr "Подані скарги" #: ckanext/issues/templates/issues/moderation.html:28 #: ckanext/issues/templates/issues/organization_issues.html:11 msgid "Organizations" -msgstr "Організації" +msgstr "Розпорядники" #: ckanext/issues/templates/issues/comment_moderation.html:68 #: ckanext/issues/templates/issues/moderation.html:69 From 22b0450ba9bb0361ec81385afd8b15d59cf72216 Mon Sep 17 00:00:00 2001 From: MaryNamj <35913614+MaryNamj@users.noreply.github.com> Date: Tue, 27 Mar 2018 09:23:41 +0300 Subject: [PATCH 06/29] Update ckanext-issues.po MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit знайшла пару помилок --- .../issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po index b702d01b..0a0a60a6 100644 --- a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po +++ b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po @@ -22,7 +22,7 @@ msgstr "" #: ckanext/issues/auth.py:20 msgid "User {0} not authorized for action on issue {1}" -msgstr "Користувач {0} не авторизований для роботи" +msgstr "Користувач {0} не авторизований для роботи зі скаргами {1}" @@ -92,7 +92,7 @@ msgstr "Ваша скарга була зареєстрована, дякуєм #: ckanext/issues/controller/controller.py:131 #: ckanext/issues/controller/controller.py:134 msgid "Issue not found: {0}" -msgstr "Скарга не знайдена : {0}" +msgstr "Скарга не знайдена: {0}" @@ -195,7 +195,7 @@ msgstr "Скарга була направлена до адміністрато #: ckanext/issues/controller/controller.py:358 msgid "You must be logged in to report comments" -msgstr "Ви повинні бути авторизовані, щоб поскаржитися на коментар" +msgstr "Ви повинні бути авторизовані, щоб поскаржитися на коментарі" @@ -351,7 +351,7 @@ msgstr "Нова скарга" #: ckanext/issues/templates/issues/add.html:16 #: ckanext/issues/templates/issues/edit.html:14 msgid "The form contains invalid entries:" -msgstr "Форма містить неправильні знаки" +msgstr "Форма містить неправильні знаки:" #: ckanext/issues/templates/issues/add.html:27 #: ckanext/issues/templates/issues/edit.html:25 @@ -393,7 +393,7 @@ msgstr "Що таке скарги?" #: ckanext/issues/templates/issues/base_form_page.html:16 msgid "

Issues are ... .

" -msgstr "

Скари – це ... .

" +msgstr "

Скарги – це ... .

" #: ckanext/issues/templates/issues/comment_moderation.html:8 #: ckanext/issues/templates/issues/moderation.html:8 From 18e7e6e3f15ec617764ed6e048b91203f9c2b430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= Date: Wed, 28 Mar 2018 23:05:54 +0300 Subject: [PATCH 07/29] Style and minor layout changes to fit into main design paradigm --- .../public/css/ckanext-issues/style.css | 107 ++++++++++-------- .../templates/issues/base_form_page.html | 2 +- ckanext/issues/templates/issues/common.html | 30 +++-- ckanext/issues/templates/issues/dataset.html | 5 +- ckanext/issues/templates/issues/show.html | 89 +++++++-------- 5 files changed, 116 insertions(+), 117 deletions(-) diff --git a/ckanext/issues/public/css/ckanext-issues/style.css b/ckanext/issues/public/css/ckanext-issues/style.css index 897939c2..8b6352eb 100644 --- a/ckanext/issues/public/css/ckanext-issues/style.css +++ b/ckanext/issues/public/css/ckanext-issues/style.css @@ -1,9 +1,9 @@ /***************************************** Issue Show - ****************************************/ + ****************************************/ .issue-header { - margin-bottom: 15px; + margin-bottom: 35px; } .issue-header h1.page-heading { @@ -17,16 +17,16 @@ .issue-header-meta { margin-top: 9px; - font-size: 14px; + font-size: 100%; line-height: 28px; color: #777; padding-bottom: 20px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #2d5ca6; } .issue-header-status { - padding: 6px 12px; - margin-right: 8px; + padding: 6px 8px; + margin-right: 10px; font-size: 14px; font-weight: bold; line-height: 20px; @@ -35,27 +35,23 @@ } .issue-header-status.open { - background-color: #6cc644; + background-color: #449d44; } .issue-header-status.closed { - background-color: red; + background-color: #c9302c; } .issue-comment-wrapper { position: relative; padding-left: 64px; - margin-top: 15px; - margin-bottom: 15px; - border-top: 2px solid #fff; - border-bottom: 2px solid #fff; + padding-bottom: 25px; + margin-bottom: 25px; + border-bottom: 1px solid #d5deed; } .issue-comment { position: relative; - background-color: #fff; - border: 1px solid #ddd; - border-radius: 4px; } .issue-comment-avatar { @@ -65,18 +61,11 @@ } .issue-comment-header { - padding-left: 15px; - padding-right: 10px; - color: #777; - background-color: #f7f7f7; - border-bottom: 1px solid #eee; - border-top-left-radius: 4px; - border-top-right-radius: 4px; + } .issue-comment-header .author { - font-weight: bold; - color: #555; + color: #2d5ca6; } .issue-comment-header .issue-comment-actions .issue-comment-action { @@ -107,23 +96,21 @@ } .issue-comment-action { - margin-top: 8px; padding-left: 5px; + margin-top: -2px; } .issue-header-text { max-width: 78%; - padding-top: 10px; - padding-bottom: 10px; + margin-bottom: 10px; + color: #818181; } .issue-comment-content { - padding: 15px; - font-size: 14px + font-size: 100%; } .issue-comment-new { - border-top: 2px solid #f3f3f3; background-color: #fff; } @@ -137,12 +124,19 @@ } .issue-comment-label { - float: right; - margin: 8px 5px 0px 10px; - padding: 2px 5px; - font-size: 12px; - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 3px; + display: inline-block; + padding: 2px 7px; + font-size: 12px; + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 3px; +} + +.list-group-item .issue-comment-label { + margin-top: 5px; +} + +.issue-comment-wrapper .issue-comment-label { + float: right; } .issue-abuse { @@ -181,29 +175,26 @@ margin-bottom: -1px; } -.list-group-item:first-child { - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} - .list-group-item { position: relative; display: block; - margin-bottom: -1px; - padding: 8px 10px 10px 40px; - border: 1px solid #e5e5e5; + margin-bottom: 25px; + padding: 0px 10px 20px 35px; + border: none; + border-bottom: 1px solid #d5deed; } .list-group-item-name { margin: 0 60px 0 0; - font-size: 15px; + font-size: 120%; line-height: 1.3; margin-bottom: 2px; word-wrap: break-word; + letter-spacing: 0px; } .list-group-item-meta { - font-size: 11px; + font-size: 90%; line-height: 17px; list-style-type: none; overflow: hidden; @@ -217,7 +208,7 @@ .list-group-item-meta>li { display: inline-block; - margin-right: 4px; + margin-right: 10px; } .list-group-item-number { @@ -231,6 +222,7 @@ .list-group-item-name .icon { float: left; + margin-top: 1px; margin-left: -24px; font-size: 16px; line-height: 1; @@ -240,7 +232,7 @@ } .list-group-item-name .icon.open { - color: #6cc644; + color: #449d44; } .list-group-item-name .icon.abuse { @@ -248,7 +240,11 @@ } .list-group-item-name .icon.closed { - color: #fe4c30; + color: #c9302c; +} + +#issue-list { + margin-top: 25px; } /* Sidebar */ @@ -262,3 +258,16 @@ margin-right: -15px; margin-bottom: 0px; } + +#ckanext-issues-assign .select2-container { + min-width: 100%; + width: 100% !important; + margin-bottom: 10px; +} + +#ckanext-issues-assignee img { + position: relative; + top: 1px; + width: 15px; + height: 15px; +} diff --git a/ckanext/issues/templates/issues/base_form_page.html b/ckanext/issues/templates/issues/base_form_page.html index 5b2d7957..8d2f5f63 100644 --- a/ckanext/issues/templates/issues/base_form_page.html +++ b/ckanext/issues/templates/issues/base_form_page.html @@ -11,7 +11,7 @@

{% block page_heading %}{% endblock %}

{% block secondary_content %}
-

{{ _('What are issues?') }}

+

{{ _('What are issues?') }}

{% trans %}

Issues are ... .

diff --git a/ckanext/issues/templates/issues/common.html b/ckanext/issues/templates/issues/common.html index 2cbcaca4..1dcb7103 100644 --- a/ckanext/issues/templates/issues/common.html +++ b/ckanext/issues/templates/issues/common.html @@ -1,19 +1,9 @@ {% macro issue_item(issue, pkg, current_user) -%}
  • #{{issue.number}} - {% set reported_by_current_user = h.issues_user_has_reported_issue(current_user, issue.abuse_reports) %} - {% if issue.visibility == 'hidden' %} -
    - Spam/Abuse - hidden from normal users -
    - {% elif reported_by_current_user %} -
    - Reported by you to admins -
    - {% endif%}

    {% set issue_icon = 'abuse' if issue.visibility == 'hidden' else issue.status %} - + {{issue.title}} @@ -21,24 +11,31 @@

    + {% set reported_by_current_user = h.issues_user_has_reported_issue(current_user, issue.abuse_reports) %} + {% if issue.visibility == 'hidden' %} +
    + {% trans %}Spam/Abuse - hidden from normal users{% endtrans %} +
    + {% elif reported_by_current_user %} +
    + {% trans %}Reported by you to admins{% endtrans %} +
    + {% endif%}

    • {%- endmacro %} {% macro search_options_sidebar(user_can_change_visibility, url_params) -%}

    - - Status + {% trans %}Status{% endtrans %}

      {% for valid_status in ['open', 'closed'] %} @@ -52,8 +49,7 @@

    {% if user_can_change_visibility %}

    - - Visibility + {% trans %}Visibility{% endtrans %}

      {% for valid_visibility in ['visible', 'hidden'] %} diff --git a/ckanext/issues/templates/issues/dataset.html b/ckanext/issues/templates/issues/dataset.html index c6f73316..27ced3b3 100644 --- a/ckanext/issues/templates/issues/dataset.html +++ b/ckanext/issues/templates/issues/dataset.html @@ -23,10 +23,7 @@

    - {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true %} -

    - {{ ungettext('{number} issue found', '{number} issues found', pagination.total_count) .format(number=pagination.total_count) }} -

    + {% snippet 'snippets/search_form.html', type='issue', count=pagination.total_count, query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true %}
    {% if issues %}
      diff --git a/ckanext/issues/templates/issues/show.html b/ckanext/issues/templates/issues/show.html index ae41f2f1..9a69f505 100644 --- a/ckanext/issues/templates/issues/show.html +++ b/ckanext/issues/templates/issues/show.html @@ -64,7 +64,7 @@ {% if header_is_for_issue and can_edit_issue %} {% endif %} @@ -79,8 +79,7 @@
      {% endif %}
    @@ -92,7 +91,7 @@
    {% endif %}
    @@ -108,7 +107,7 @@
    {% endif %}
    @@ -130,29 +129,29 @@ {% if reports_by_users %}
    - {{ reports_by_users }} user reports this is spam/abuse + {{ reports_by_users }} {% trans %}user reports this is spam/abuse{% endtrans %}
    {% endif %} {% if issue_or_comment.visibility != 'visible' %}
    - Hidden from normal users + {% trans %}Hidden from normal users{% endtrans %}
    {% endif %} {% if issue_or_comment.abuse_status != 'unmoderated' %}
    - Moderated: {{ issue_or_comment.abuse_status }} + {% trans %}Moderated{% endtrans %}: {{ issue_or_comment.abuse_status }}
    {% endif %} {% endif %} {% if h.issues_user_is_owner(user=issue_or_comment.user, dataset_id=dataset.id) %}
    - Owner + {% trans %}Owner{% endtrans %}
    {% endif %}
    {{ issue_or_comment.user.name}} - commented + {% trans %}commented{% endtrans %} {{ h.time_ago_from_timestamp(issue_or_comment.created).lower() }}
    @@ -164,11 +163,11 @@

    {{issue.title}} - #{{issue.number}} + #{{issue.number}}

    - {{issue.status.title()}} + {{issue.status.title()}} {{issue.user.name}} opened this issue {{issue.time_ago}} · {{ ungettext('{number} comment', '{number} comments', comment_count).format(number=comment_count) }} @@ -188,7 +187,7 @@

    {% if c.user %} - {{c.current_user.gravatar}} + {{ h.gravatar((c.userobj.email_hash), size=48) }}
    placeholder="Leave a comment" tabindex="1"> - You can use Markdown formatting here + {% trans %}You can use Markdown formatting here<{% endtrans %}/span>

    {% block form_actions %} @@ -238,48 +237,46 @@

    {% block secondary_content %}
    +
    + {% trans %}All issues of this dataset{% endtrans %} +
    -

    {{ dataset.name }}

    -
    + +

    {{ dataset.title }}

    -
    -

    - - Assignee -

    -
    - {% if issue.assignee %} - {{ h.gravatar((issue.assignee.email_hash), size=22) }} - {{ issue.assignee.name }} - {% elif issue.assignee_id %} - {{ _('This issue has been assigned to an administrator for the publisher') }} - {% else %} - {{ _('No one') }} - {% endif %} -
    - {% block assignee_form %} - {% if is_publisher %}

    - - Change Assignee + {% trans %}Assignee{% endtrans %}

    - +
    +
    + {% if issue.assignee %} + {{ h.gravatar((issue.assignee.email_hash), size=22) }} {{ issue.assignee.name }} + {% elif issue.assignee_id %} + {{ _('This issue has been assigned to an administrator for the publisher') }} + {% else %} + {{ _('No one') }} + {% endif %} +
    +
    + {% block assignee_form %} {% if is_publisher %} +

    + {% trans %}Change Assignee{% endtrans %} +

    +
    +
    - - {% else %} - data-module-source="/api/3/action/user_autocomplete?q=?"> - {% endif %} + {% else %} data-module-source="/api/3/action/user_autocomplete?q=?"> {% endif %}
    -
    - {% endif %} - {% endblock %} + {% endif %} {% endblock %} +
    +
    +
    {% endblock %} From a007104836f4c683ce3734b9b85cd87dce085af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= Date: Thu, 29 Mar 2018 17:22:20 +0300 Subject: [PATCH 08/29] Change buttons design and position in comment moderation Fix typo Added trans tags where necessary --- .../public/css/ckanext-issues/style.css | 32 ++++ .../issues/templates/issues/all_issues.html | 2 +- .../templates/issues/base_form_page.html | 4 +- ckanext/issues/templates/issues/show.html | 165 +++++++++--------- 4 files changed, 120 insertions(+), 83 deletions(-) diff --git a/ckanext/issues/public/css/ckanext-issues/style.css b/ckanext/issues/public/css/ckanext-issues/style.css index 8b6352eb..b9d6fd29 100644 --- a/ckanext/issues/public/css/ckanext-issues/style.css +++ b/ckanext/issues/public/css/ckanext-issues/style.css @@ -50,6 +50,10 @@ border-bottom: 1px solid #d5deed; } +.issue-comment-wrapper:last-of-type { + border-bottom: none; +} + .issue-comment { position: relative; } @@ -143,6 +147,34 @@ color: #b0b0b0; } +.issue-comment-footer { + margin-top: 10px; + font-size: 80%; +} + +.issue-comment-footer .issue-comment-action { + margin-bottom: 5px; + margin-top: 0px; + padding-left: 0px; + display: inline-block; +} + +.issue-comment-footer .issue-comment-action .link-button { + border: none; + padding: 0px; + margin-right: 10px; + color: #2d5ca6; +} + +.issue-comment-footer .issue-comment-action .link-button:hover { + color: #23527c; +} + +.issue-comment-footer .issue-comment-label { + margin-bottom: 5px; + float: none; +} + /***************************************** Issue homes - dataset, organization, all ****************************************/ diff --git a/ckanext/issues/templates/issues/all_issues.html b/ckanext/issues/templates/issues/all_issues.html index 54884448..447e9d61 100644 --- a/ckanext/issues/templates/issues/all_issues.html +++ b/ckanext/issues/templates/issues/all_issues.html @@ -21,5 +21,5 @@ {% endblock %} {% block no_issues %} - There are currently no issues + {% trans %}There are currently no issues{% endtrans %} {% endblock %} diff --git a/ckanext/issues/templates/issues/base_form_page.html b/ckanext/issues/templates/issues/base_form_page.html index 8d2f5f63..b96c9acc 100644 --- a/ckanext/issues/templates/issues/base_form_page.html +++ b/ckanext/issues/templates/issues/base_form_page.html @@ -13,9 +13,7 @@

    {% block page_heading %}{% endblock %}

    {{ _('What are issues?') }}

    - {% trans %} -

    Issues are ... .

    - {% endtrans %} +

    {% trans %}Issues are ... .{% endtrans %}

    {% endblock %} diff --git a/ckanext/issues/templates/issues/show.html b/ckanext/issues/templates/issues/show.html index 9a69f505..f489aa29 100644 --- a/ckanext/issues/templates/issues/show.html +++ b/ckanext/issues/templates/issues/show.html @@ -39,6 +39,7 @@
    {{ h.render_markdown(issue.comment) }}
    + {{ issue_or_comment_footer(issue_or_comment=issue, dataset=dataset, issue=issue, header_is_for_issue=False, can_edit_issue=can_edit_issue) }} {% endmacro %} @@ -54,6 +55,7 @@
    {{ h.render_markdown(comment.comment) }}
    + {{ issue_or_comment_footer(issue_or_comment=comment, dataset=dataset, issue=issue, header_is_for_issue=False, can_edit_issue=can_edit_issue) }} {% endmacro %} @@ -68,81 +70,6 @@ {% endif %} - {% if c.user and not can_edit_issue %} - {# a normal user can report this comment/issue #} - {% set reported_by_current_user = h.issues_user_has_reported_issue(c.user, issue_or_comment.abuse_reports) %} - {% if not reported_by_current_user %} -
    - {% if header_is_for_issue %} -
    - {% else %} - - {% endif %} - -
    -
    - {% else %} -
    - {% if header_is_for_issue %} -
    - {% else %} - - {% endif %} - -
    -
    - {% endif %} - {% elif c.user %} - {# i.e. an admin, so allow moderation #} - {% set reports_by_users = issue_or_comment.abuse_reports|length %} - {# always offer the "this is spam" button #} -
    - {% if header_is_for_issue %} -
    - {% else %} - - {% endif %} - -
    -
    - {# only offer the "this isn't spam" button if it has been marked as spam by users or moderator and therefore it might need denying or cancelling #} - {% if (reports_by_users or issue_or_comment.visibility != 'visible') %} -
    - {% if header_is_for_issue %} -
    - {% else %} - - {% endif %} - -
    -
    - {% endif %} - {% if reports_by_users %} -
    - {{ reports_by_users }} {% trans %}user reports this is spam/abuse{% endtrans %} -
    - {% endif %} - {% if issue_or_comment.visibility != 'visible' %} -
    - {% trans %}Hidden from normal users{% endtrans %} -
    - {% endif %} - {% if issue_or_comment.abuse_status != 'unmoderated' %} -
    - {% trans %}Moderated{% endtrans %}: {{ issue_or_comment.abuse_status }} -
    - {% endif %} - {% endif %} {% if h.issues_user_is_owner(user=issue_or_comment.user, dataset_id=dataset.id) %}
    @@ -157,6 +84,85 @@
    {% endmacro %} +{%- macro issue_or_comment_footer(issue_or_comment, dataset, issue, header_is_for_issue, can_edit_issue) %} +
    + {% if c.user and not can_edit_issue %} + {# a normal user can report this comment/issue #} + {% set reported_by_current_user = h.issues_user_has_reported_issue(c.user, issue_or_comment.abuse_reports) %} + {% if not reported_by_current_user %} +
    + {% if header_is_for_issue %} +
    + {% else %} + + {% endif %} + +
    +
    + {% else %} +
    + {% if header_is_for_issue %} +
    + {% else %} + + {% endif %} + +
    +
    + {% endif %} + {% elif c.user %} + {# i.e. an admin, so allow moderation #} + {% set reports_by_users = issue_or_comment.abuse_reports|length %} + {# always offer the "this is spam" button #} +
    + {% if header_is_for_issue %} +
    + {% else %} + + {% endif %} + +
    +
    + {# only offer the "this isn't spam" button if it has been marked as spam by users or moderator and therefore it might need denying or cancelling #} + {% if (reports_by_users or issue_or_comment.visibility != 'visible') %} +
    + {% if header_is_for_issue %} +
    + {% else %} + + {% endif %} + +
    +
    + {% endif %} + {% if reports_by_users %} +
    + {{ reports_by_users }} {% trans %}user reports this is spam/abuse{% endtrans %} +
    + {% endif %} + {% if issue_or_comment.visibility != 'visible' %} +
    + {% trans %}Hidden from normal users{% endtrans %} +
    + {% endif %} + {% if issue_or_comment.abuse_status != 'unmoderated' %} +
    + {% trans %}Moderated{% endtrans %}: {{ issue_or_comment.abuse_status }} +
    + {% endif %} + {% endif %} +
    +{% endmacro %} + {% block primary_content %}
    @@ -169,7 +175,7 @@

    {{issue.status.title()}} - {{issue.user.name}} opened this issue {{issue.time_ago}} · + {{issue.user.name}} {% trans %}opened this issue{% endtrans %} {{issue.time_ago}} · {{ ungettext('{number} comment', '{number} comments', comment_count).format(number=comment_count) }}

    @@ -195,10 +201,10 @@

    - {% trans %}You can use Markdown formatting here<{% endtrans %}/span> + {% trans %}You can use Markdown formatting here{% endtrans %}
    {% block form_actions %} @@ -275,7 +281,8 @@

    - {% endif %} {% endblock %} + {% endif %} + {% endblock %} From 8fc6066404afcc4bf6606d9c09e457a9cd7a6a52 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 10 Apr 2018 08:47:45 +0300 Subject: [PATCH 09/29] Changed datetime.now on datetime.utcnow defauld fields value (#5) --- ckanext/issues/model/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ckanext/issues/model/__init__.py b/ckanext/issues/model/__init__.py index 2a8e9e86..423880f4 100644 --- a/ckanext/issues/model/__init__.py +++ b/ckanext/issues/model/__init__.py @@ -469,7 +469,7 @@ def clear_all_abuse_reports(self, session): Column('name', types.Unicode(ISSUE_CATEGORY_NAME_MAX_LENGTH), nullable=False, unique=True), Column('description', types.Unicode, nullable=False, unique=False), - Column('created', types.DateTime, default=datetime.now, + Column('created', types.DateTime, default=datetime.utcnow, nullable=False)) issue_table = Table( @@ -486,7 +486,7 @@ def clear_all_abuse_reports(self, session): Column('status', types.String(15), default=ISSUE_STATUS.open, nullable=False), Column('resolved', types.DateTime), - Column('created', types.DateTime, default=datetime.now, + Column('created', types.DateTime, default=datetime.utcnow, nullable=False), Column('visibility', types.Unicode, default=u'visible'), Column('abuse_status', @@ -505,7 +505,7 @@ def clear_all_abuse_reports(self, session): Column('issue_id', types.Integer, ForeignKey('issue.id', onupdate='CASCADE', ondelete='CASCADE'), nullable=False, index=True), - Column('created', types.DateTime, default=datetime.now, + Column('created', types.DateTime, default=datetime.utcnow, nullable=False), Column('visibility', types.Unicode, default=u'visible'), Column('abuse_status', From 53b3115820a9290bc6b5ee96b03fe0d089d05e42 Mon Sep 17 00:00:00 2001 From: DaleDMT Date: Fri, 13 Apr 2018 12:04:14 +0300 Subject: [PATCH 10/29] Fixed translation --- ckanext/issues/i18n/ckanext-issues.pot | 1 - .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo | Bin 10075 -> 10107 bytes .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ckanext/issues/i18n/ckanext-issues.pot b/ckanext/issues/i18n/ckanext-issues.pot index 8da087b4..e64eeb38 100644 --- a/ckanext/issues/i18n/ckanext-issues.pot +++ b/ckanext/issues/i18n/ckanext-issues.pot @@ -3,7 +3,6 @@ # This file is distributed under the same license as the ckanext-issues project. # FIRST AUTHOR , 2018. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: ckanext-issues 0.3\n" diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo index d992f9c2512f9846ef36371bd704b639a33722bc..b505297b152b1c5cd7b1159a1fc0c08a1276f22a 100644 GIT binary patch delta 926 zcmXZbO-K}B7{Kvo#}A}+bJf*#)zbB&kF}585($kx6v2icXm;>q5$PdnRp_E7qj;(a z1hYM)pwz8Hs}p2()DB*1mhhygnTPV=%?gU>|F{Fg{GMlK-uHRmXJ*#g{C+Zxq;KD1OKA7+RbWOumO8<9Pi;S>W;f; z*D;KvZeR*^o_WXo>U2JEV5dlmAkG63euYaoi+%VFYq6744-TR(WD}_+d#Dq8six!m z@wwi&R-8cU7a3wF}_;EQKkp}GT6u|N4T5jc9*}AQ!wd?wa(l*x=6c;*Fijpm>p6pUd5k#)uHn5lw3K5KQ zMFb7>CU|gb6on2d3q@u+c#AYV=%rJ%1X73kJ{%b4^WOaVz4v=FeyM>k5iySh+$%`gx!OwUEx3C!ZunV0$REQ6;0bkhp3Ko%X zdkv8mfGqf1~y|e zj$jpT8w5du9NN^KhHcwyAD}ky6svI(bz+;S3;)7g{D;(*T(+f!DpA*qBPC=Avv3+2 zj?CgkG(HfpIZ0z5y7&R~8x0_9%2(8p{zfg}J$Ep=YSeEUL2YCNPv8`0;#*{>GLK>W zg8EM!rTa&ikH@Gl&k6Kfy~1ml#yeQ&7rBjNs4woLj@n5#t$5kiz;5z2)Ezf4u5yf` zZXk}jPQo^A+fky|JNStRv?F(^$W?rXJ($8Wtl@MYJ5d{1LTbr6>cT%UhEb}H>wWW6 zR-4N#a*t+Y4_k}YoRzfRTZ`sWUhGhY-wYOfKWw^uDMzBe*!wQ<#*s({Jmy^KN5_9> CrF206 diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po index 0a0a60a6..f20bc81d 100644 --- a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po +++ b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po @@ -372,7 +372,7 @@ msgstr "Додати коментар" #: ckanext/issues/templates/issues/confirm_delete.html:14 #: ckanext/issues/templates/issues/edit.html:34 msgid "Cancel" -msgstr "Видалити" +msgstr "Скасувати" #: ckanext/issues/templates/issues/add.html:35 msgid "Create" From d45630f5acf38a0883a250ba19767acef310b364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= Date: Fri, 11 May 2018 16:39:51 +0300 Subject: [PATCH 11/29] Fix font size of "new issue" button --- ckanext/issues/public/css/ckanext-issues/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ckanext/issues/public/css/ckanext-issues/style.css b/ckanext/issues/public/css/ckanext-issues/style.css index b9d6fd29..7d8db3b7 100644 --- a/ckanext/issues/public/css/ckanext-issues/style.css +++ b/ckanext/issues/public/css/ckanext-issues/style.css @@ -6,6 +6,10 @@ margin-bottom: 35px; } +h1.page-heading .issues-actions .btn { + font-size: 15px; +} + .issue-header h1.page-heading { word-wrap: break-word; margin-bottom: 0; From e70965964cd69a0f78146765929780416c17850b Mon Sep 17 00:00:00 2001 From: DaleDMT Date: Mon, 14 May 2018 11:07:12 +0300 Subject: [PATCH 12/29] Fix email templates --- .../templates/issues/email/new_comment.html | 23 +++++++++---------- .../templates/issues/email/new_issue.html | 22 ++++++++++-------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ckanext/issues/templates/issues/email/new_comment.html b/ckanext/issues/templates/issues/email/new_comment.html index 67dd2246..23fb06fa 100644 --- a/ckanext/issues/templates/issues/email/new_comment.html +++ b/ckanext/issues/templates/issues/email/new_comment.html @@ -1,20 +1,19 @@ -A user '{{ user.fullname }}' has added a comment to one of your issues on {{ site_title }}. - -{% trans %}The dataset is: {% endtrans %}{{ dataset.title }} -The issue is: {{ issue_subject }} -The comment is: +

    {% trans %}A user {{ user.fullname }} has added a comment to one of your issues on {{ site_title }}.{% endtrans %}

    +

    {% trans %}The dataset is{% endtrans %}: {{ dataset.title }}
    +{% trans %}The issue is{% endtrans %}: {{ issue_subject }}
    +{% trans %}The comment is{% endtrans %}:
    > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} +

    +

    {% trans %}In order to respond to the comment, please see the issue at{% endtrans %}: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. {% trans %}Once the issue has been resolved, click 'Close issue'.{% endtrans %}

    -In order to respond to the comment, please see the issue at: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. - -Thank you, +

    {% trans %}Thank you{% endtrans %}

    -The {{ site_title }} team +

    {% trans %}The {{ site_title }} team{% endtrans %}

    --- +

    --

    -Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +

    {% trans %}Issue{% endtrans %}: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}

    +

    {% trans %}Dataset{% endtrans %}: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}

    diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html index 64958d81..dc9acda0 100644 --- a/ckanext/issues/templates/issues/email/new_issue.html +++ b/ckanext/issues/templates/issues/email/new_issue.html @@ -1,20 +1,22 @@ -{% trans %}On{% endtrans %} {{ site_title }} {% trans %}a user has raised an issue with one of the datasets from organization{% endtrans %} '{{ recipient.organization_title }}', for which you are an {{ recipient.capacity }}.' for which you are an {{ capacity }}. +

    {% trans %}On{% endtrans %} {{ site_title }} {% trans %}a user has raised an issue with one of the datasets from organization{% endtrans %} '{{ recipient.organization_title }}', for which you are an {{ recipient.capacity }}.' for which you are an {{ capacity }}.

    -{% trans %}The dataset is: {% endtrans %}{{ dataset.title }} -{% trans %}The issue is:{% endtrans %} +

    {% trans %}The dataset is: {% endtrans %}{{ dataset.title }}

    + +

    {% trans %}The issue is:{% endtrans %} > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} +

    +

    {% trans %}Please correct the problem or add an initial comment about the issue at: {% endtrans %}{{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.

    -{% trans %}Please correct the problem or add an initial comment about the issue at: {% endtrans %}{{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. - -{% trans %}Thank you,{% endtrans %} +

    {% trans %}Thank you,{% endtrans %}

    -{% trans %}The{% endtrans %} {{ site_title }} {% trans %}team{% endtrans %} +

    {% trans %}The{% endtrans %} {{ site_title }} {% trans %}team{% endtrans %}

    --- +

    --

    -{% trans %}Issue:{% endtrans %} {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +

    {% trans %}Issue:{% endtrans %} {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} {% trans %}Dataset:{% endtrans %} {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} -{% trans %}User:{% endtrans %} {{ user.fullname or user.name }} \ No newline at end of file +{% trans %}User:{% endtrans %} {{ user.fullname or user.name }} +

    From 5e1db4cce22cf386e2930523b7e896b3639dd72e Mon Sep 17 00:00:00 2001 From: Ivankin Date: Wed, 16 May 2018 16:18:16 +0000 Subject: [PATCH 13/29] change translation --- ckanext/issues/i18n/ckanext-issues.pot | 166 ++++++-- .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo | Bin 10107 -> 11682 bytes .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 360 +++++++++--------- .../templates/issues/base_form_page.html | 2 +- 4 files changed, 324 insertions(+), 204 deletions(-) diff --git a/ckanext/issues/i18n/ckanext-issues.pot b/ckanext/issues/i18n/ckanext-issues.pot index e64eeb38..0e2100c0 100644 --- a/ckanext/issues/i18n/ckanext-issues.pot +++ b/ckanext/issues/i18n/ckanext-issues.pot @@ -3,11 +3,12 @@ # This file is distributed under the same license as the ckanext-issues project. # FIRST AUTHOR , 2018. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: ckanext-issues 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-03-20 22:27+0000\n" +"POT-Creation-Date: 2018-05-16 16:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -297,6 +298,10 @@ msgstr "" msgid "All Issues" msgstr "" +#: ckanext/issues/templates/issues/all_issues.html:24 +msgid "There are currently no issues" +msgstr "" + #: ckanext/issues/templates/issues/base.html:9 msgid "Datasets" msgstr "" @@ -306,7 +311,7 @@ msgid "What are issues?" msgstr "" #: ckanext/issues/templates/issues/base_form_page.html:16 -msgid "

    Issues are ... .

    " +msgid "Issues are the system for getting feedback about datasets." msgstr "" #: ckanext/issues/templates/issues/comment_moderation.html:8 @@ -325,12 +330,28 @@ msgstr "" msgid "Not abuse" msgstr "" -#: ckanext/issues/templates/issues/common.html:30 +#: ckanext/issues/templates/issues/common.html:18 #: ckanext/issues/templates/issues/organization_issues.html:76 #, python-format msgid "%s comments" msgstr "" +#: ckanext/issues/templates/issues/common.html:25 +msgid "Spam/Abuse - hidden from normal users" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:29 +msgid "Reported by you to admins" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:38 +msgid "Status" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:52 +msgid "Visibility" +msgstr "" + #: ckanext/issues/templates/issues/confirm_delete.html:3 #: ckanext/issues/templates/issues/confirm_delete.html:15 msgid "Confirm Delete" @@ -353,7 +374,19 @@ msgstr "" msgid "Search issues..." msgstr "" -#: ckanext/issues/templates/issues/dataset.html:28 +#: ckanext/issues/templates/issues/dataset.html:35 +msgid "No issues" +msgstr "" + +#: ckanext/issues/templates/issues/edit.html:3 +#: ckanext/issues/templates/issues/edit.html:5 +msgid "Edit Issue" +msgstr "" + +#: ckanext/issues/templates/issues/edit.html:36 +msgid "Update" +msgstr "" + #: ckanext/issues/templates/issues/organization_issues.html:29 #: ckanext/issues/templates/snippets/search_result_text.html:5 msgid "{number} issue found" @@ -361,68 +394,119 @@ msgid_plural "{number} issues found" msgstr[0] "" msgstr[1] "" -#: ckanext/issues/templates/issues/dataset.html:38 -msgid "No issues" +#: ckanext/issues/templates/issues/show.html:76 +msgid "Owner" msgstr "" -#: ckanext/issues/templates/issues/edit.html:3 -#: ckanext/issues/templates/issues/edit.html:5 -msgid "Edit Issue" +#: ckanext/issues/templates/issues/show.html:81 +msgid "commented" msgstr "" -#: ckanext/issues/templates/issues/edit.html:36 -msgid "Update" +#: ckanext/issues/templates/issues/show.html:100 +msgid "Report abuse" msgstr "" -#: ckanext/issues/templates/issues/show.html:125 +#: ckanext/issues/templates/issues/show.html:111 +msgid "You have reported this as abuse, cancel the report" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:112 +#: ckanext/issues/templates/issues/show.html:128 +msgid "Flag" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:127 +msgid "Mark as spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:140 +msgid "Mark as NOT spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:141 msgid "Not spam/abuse" msgstr "" -#: ckanext/issues/templates/issues/show.html:174 +#: ckanext/issues/templates/issues/show.html:149 +msgid "user reports this is spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:154 +msgid "Hidden from normal users" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:159 +msgid "Moderated" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:178 +msgid "opened this issue" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:179 msgid "{number} comment" msgid_plural "{number} comments" msgstr[0] "" msgstr[1] "" -#: ckanext/issues/templates/issues/show.html:208 +#: ckanext/issues/templates/issues/show.html:204 +msgid "Leave a comment" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:207 +msgid "You can use Markdown formatting here" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:213 msgid "Are you sure you want to delete this issue?" msgstr "" -#: ckanext/issues/templates/issues/show.html:209 +#: ckanext/issues/templates/issues/show.html:214 msgid "Delete" msgstr "" -#: ckanext/issues/templates/issues/show.html:214 +#: ckanext/issues/templates/issues/show.html:219 msgid "Close" msgstr "" -#: ckanext/issues/templates/issues/show.html:218 +#: ckanext/issues/templates/issues/show.html:223 msgid "Re-open" msgstr "" -#: ckanext/issues/templates/issues/show.html:224 +#: ckanext/issues/templates/issues/show.html:229 msgid "Comment" msgstr "" -#: ckanext/issues/templates/issues/show.html:231 +#: ckanext/issues/templates/issues/show.html:236 msgid "Login to comment" msgstr "" -#: ckanext/issues/templates/issues/show.html:256 +#: ckanext/issues/templates/issues/show.html:247 +msgid "All issues of dataset" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:247 +msgid "All issues of this dataset" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:255 +msgid "Assignee" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:262 msgid "This issue has been assigned to an administrator for the publisher" msgstr "" -#: ckanext/issues/templates/issues/show.html:258 +#: ckanext/issues/templates/issues/show.html:264 msgid "No one" msgstr "" -#: ckanext/issues/templates/issues/show.html:279 -msgid "Assign" +#: ckanext/issues/templates/issues/show.html:270 +msgid "Change Assignee" msgstr "" -#: ckanext/issues/templates/issues/email/new_comment.html:4 -#: ckanext/issues/templates/issues/email/new_issue.html:4 -msgid "The dataset is: " +#: ckanext/issues/templates/issues/show.html:280 +msgid "Assign" msgstr "" #: ckanext/issues/templates/issues/email/new_issue.html:2 @@ -433,18 +517,42 @@ msgstr "" msgid "a user has raised an issue with one of the datasets from organization" msgstr "" -#: ckanext/issues/templates/issues/email/new_issue.html:5 +#: ckanext/issues/templates/issues/email/new_issue.html:4 +msgid "The dataset is: " +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:6 msgid "The issue is:" msgstr "" -#: ckanext/issues/templates/issues/email/new_issue.html:10 +#: ckanext/issues/templates/issues/email/new_issue.html:11 msgid "Please correct the problem or add an initial comment about the issue at: " msgstr "" -#: ckanext/issues/templates/issues/email/new_issue.html:12 +#: ckanext/issues/templates/issues/email/new_issue.html:13 msgid "Thank you," msgstr "" +#: ckanext/issues/templates/issues/email/new_issue.html:15 +msgid "The" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:15 +msgid "team" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:19 +msgid "Issue:" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:20 +msgid "Dataset:" +msgstr "" + +#: ckanext/issues/templates/issues/email/new_issue.html:21 +msgid "User:" +msgstr "" + #: ckanext/issues/templates/snippets/search_result_text.html:3 msgid "{number} issue found for \"{query}\"" msgid_plural "{number} issues found for \"{query}\"" diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo index b505297b152b1c5cd7b1159a1fc0c08a1276f22a..85b7775dabbc95f73848ccdacf59273dc0665dcc 100644 GIT binary patch literal 11682 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 delta 3550 zcmb8ve@xWp9l-JD98wSj6iyFBcz`<)JbnmjjI%VeTO+luKh~s;-E2{>okf1g(QJjd zQ^{KUW8(TKq_cC{UrV#3-fk~N*fnRff5F>BVDtZDZC+LJ zK+knbEyH}2b}KN58*wG}B2CpXT#V1U_menZsfaqq1^?=GzLw%|u@R>*fJHe<72{eg z!<(@HLns3ep!6TYML3N7tD~;RQQG|+C4rYw0#9Nq^Q$+wDCEIalmK#a$p$r+U?Zk8 z!W!;-Q6@4d0lk3I|5cRs7JYcxeg3KYyntD&d0vB3v70cP`PFv0z+EVr_hBm@$0Bsl zi&My0>MBa0^GHYT%TNOF<8oY$((ewGad)7!dl02^16YN_7?Bq*xGzrOJnqk~Ue|+I%Y6*j;~%jCiy7n_*os;BeU!}iq69LA4Vc86@G@TX zFjs_~-uEq~hGOuCbrQ;Ulk=lkUaRB*OC-{<5pGIl-HgbT}MU>6; zH{6bSG?LxkgHo}_-TOC?-eozoAeh*anv{lnP2^e3zAbG;}90I0c4GyK*m<@ zqLlP1$^>QXIGU=}C~JB#g+#v_%P}J7@i8uBt&ZT0 z_%FNMzKTD%{Ju^a!6lJVV?OHN4-N&-hw#)-Kus>$5%siFSz z!r?&=uHqzaYD6BjC zL%OM{NjGh1?rYa75Y{_-ySqa@17Wi+=XR6K>Ce8gvu8(WcYJg10#7`=VBBNw%fBbk z`@pUqJ<$7EYqh1bzbmv;cQWGkhr*%ea9?M4lkqS7#MBlH=I`k0>HXgB(9Q=!JDbdf zf;yuMtFrC5J@ERAW^>`4@l@fsr|7Qlb`GTD*_96MhWON?W1g&mP-k~MRb1j((AL=6 zrd!(9uUQrUQ%Tt4mn`f_o3v49pN-pup4w-$^N5|Cm5|x8BxahIzP;FOxZfFO+Ng8D zCQQBW;mVlYYn!rB`wF8(d3n}Oa-Xngw4E?9-|~4jYDRos^S+Pz*q_+*_MEg}2#7-D%_>4vdPZ%MHgvI3-kITL{Y9C+44nxz zYCiTgZ~I)wnM|bHbX^(p6-kc#2D!XYP@Dzh8}9!o31oV zNt;YsQFmRV=9kOs&8~{B%2DTtGe*S;Jx(4eVjuzM5%L^U_BnHXwa-*mE;093mX=Is z=nOZ1mbW=s`E=7sw#_J0NF^q?N;ywv)+xQ-%KnsRNz#nl^W2y|z0&O0K9kb7cFbMA zr)Yjw+2eCWHSz_I&6UcM`BH-uMpt;f31xrGuAY!cC;;JdLQJaa9dn|(%Dh{>u7$bEP(~ z^b32LLv=y3sV?xPE&5FEit;ra{zT@)$i_>_zM47qL@`HP&Zs%H;)W_Iw}hj=tX1UN zmoqFmqACkP(OKAiQ_<*=Xr|5&}wXfX5Z6`M7UxwXt|{!#DK z|1*U^LzlT!?=>$qtj*$Qal%|`IBX7AEL}7AYH|`YVapC+AE@-%p8g>;bwR(01WU6s bt;`RCWiyw4b0rv<^;u-LHGbXnG_L*+ygR&# diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po index f20bc81d..1b079b4e 100644 --- a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po +++ b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-issues 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-03-23 03:51+0000\n" +"POT-Creation-Date: 2018-05-16 16:14+0000\n" "PO-Revision-Date: 2018-03-20 22:22+0000\n" "Last-Translator: FULL NAME \n" "Language: uk_UA\n" @@ -22,259 +22,177 @@ msgstr "" #: ckanext/issues/auth.py:20 msgid "User {0} not authorized for action on issue {1}" -msgstr "Користувач {0} не авторизований для роботи зі скаргами {1}" - - - - - +msgstr "Користувач {0} не має достатньо прав для роботи зі скаргами {1}" #: ckanext/issues/auth.py:42 msgid "User {0} not authorized for action" -msgstr "Користувач {0} не авторизований для роботи" - - +msgstr "Користувач {0} не має достатньо прав для цієї дії" #: ckanext/issues/auth.py:91 msgid "User {user} not authorized for action on issue {issue}" -msgstr "Користувач {user} не авторизований для роботи зі скаргами {issue}" - - - +msgstr "Користувач {user} не має достатньо прав для роботи зі скаргами {issue}" #: ckanext/issues/controller/controller.py:48 msgid "Issues have not been enabled for this dataset" msgstr "Скарги недоступні для цього набору даних" - - #: ckanext/issues/controller/controller.py:51 #: ckanext/issues/controller/controller.py:69 msgid "Dataset not found" msgstr "Набір даних не знайдено" - - #: ckanext/issues/controller/controller.py:54 msgid "Unauthorized to view issues for this dataset" -msgstr "Немає доступу для перегляду скарг на цей набір даних" - - +msgstr "У вас немає доступу для перегляду скарг по цьому набору даних" #: ckanext/issues/controller/controller.py:66 msgid "Issues have not been enabled for this organization" -msgstr "Скарги недоступні для цієї організації" - +msgstr "Скарги недоступні для цього розпорядника" #: ckanext/issues/controller/controller.py:72 msgid "Unauthorized to view issues for this organization" -msgstr "Немає доступу для перегляду скарг на цю організацію" - +msgstr "У вас немає доступу для перегляду скарг на цього розпорядника" #: ckanext/issues/controller/controller.py:77 msgid "Please login to add a new issue" msgstr "Будь ласка, увійдіть, щоб додати нову скаргу" - #: ckanext/issues/controller/controller.py:86 msgid "Not authorized to add a new issue" -msgstr "Немає доступу для додавання нової скарги" - - - +msgstr "У вас немає доступу для додавання нової скарги" #: ckanext/issues/controller/controller.py:113 msgid "Your issue has been registered, thank you for the feedback" -msgstr "Ваша скарга була зареєстрована, дякуємо за зворотній зв'язок" - - +msgstr "Ваша скарга була зареєстрована. Дякуємо за зворотній зв'язок" #: ckanext/issues/controller/controller.py:131 #: ckanext/issues/controller/controller.py:134 msgid "Issue not found: {0}" -msgstr "Скарга не знайдена: {0}" - - +msgstr "Скаргу не знайдено: {0}" #: ckanext/issues/controller/controller.py:178 msgid "Invalid request" -msgstr "Запит невірний" - - +msgstr "Неправильний запит" #: ckanext/issues/controller/controller.py:190 msgid "Not authorized" msgstr "Немає доступу" - #: ckanext/issues/controller/controller.py:199 msgid "Comment cannot be empty" msgstr "Поле \"Комментар\" не може бути порожнім" - - #: ckanext/issues/controller/controller.py:215 msgid "Issue closed" -msgstr "Скарга закрита" - - +msgstr "Скаргу закрито" #: ckanext/issues/controller/controller.py:217 msgid "Issue re-opened" -msgstr "Скарга знову відкрита" - - +msgstr "Скаргу знову відкрито" #: ckanext/issues/controller/controller.py:255 msgid "Unauthorized to delete issue {0}" -msgstr "Немає доступу, щоб видалити скаргу {0}" - - +msgstr "У вас недостатньо прав доступу, щоб видалити скаргу {0}" #: ckanext/issues/controller/controller.py:260 msgid "Issue {0} has been deleted." -msgstr "Скарга {0} була видалена" - - +msgstr "Скаргу {0} видалено." #: ckanext/issues/controller/controller.py:278 msgid "User {0} does not exist" msgstr "Користувача {0} не існує" - - #: ckanext/issues/controller/controller.py:298 msgid "Assigned to {user}" msgstr "Закріплена за {user}" - - #: ckanext/issues/controller/controller.py:308 msgid "Unauthorized to assign users to issue" -msgstr "Немає доступу для закріплення користувачів до скарги" - - +msgstr "У вас немає прав доступу для закріплення користувачів за скаргою" #: ckanext/issues/controller/controller.py:322 msgid "You must be logged in to report issues" -msgstr "Ви повинні увійти, щоб подати скарги" - - +msgstr "Ви повинні увійти, щоб подавати скарги" #: ckanext/issues/controller/controller.py:333 #: ckanext/issues/controller/controller.py:370 msgid "Report acknowledged." -msgstr "Звіт підтверджено" - - +msgstr "Звіт підтверджено." #: ckanext/issues/controller/controller.py:336 #: ckanext/issues/controller/controller.py:373 msgid "Marked as abuse/spam." -msgstr "Позначено як образу/спам" - - +msgstr "Позначено як зловживання/спам." #: ckanext/issues/controller/controller.py:337 msgid "Issue is visible." -msgstr "Скарга видима" - - +msgstr "Скарга - видима." #: ckanext/issues/controller/controller.py:339 msgid "Issue is invisible to normal users." -msgstr "Скарга невидима для простих користувачів" - - +msgstr "Скарга - невидима для звичайних користувачів." #: ckanext/issues/controller/controller.py:342 msgid "Issue reported to an administrator" -msgstr "Скарга була направлена до адміністратора" - - +msgstr "Скаргу надіслано адміністратору" #: ckanext/issues/controller/controller.py:358 msgid "You must be logged in to report comments" -msgstr "Ви повинні бути авторизовані, щоб поскаржитися на коментарі" - - +msgstr "Ви повинні зайти в систему, щоб поскаржитися на коментарі" #: ckanext/issues/controller/controller.py:374 msgid "Comment is visible." -msgstr "Коментар видимий" - - +msgstr "Коментар - видимий." #: ckanext/issues/controller/controller.py:376 msgid "Comment is invisible to normal users." -msgstr "Коментар невидимий для простих користувачів" - - +msgstr "Коментар - невидимий для простих користувачів." #: ckanext/issues/controller/controller.py:379 msgid "Comment has been reported to an administrator" -msgstr "Коментар був направлений до адміністратора" - - +msgstr "Коментар надіслано адміністратору" #: ckanext/issues/controller/controller.py:402 msgid "Issue report cleared" -msgstr "Скарга була розглянута" - - +msgstr "Скаргу розглянуто" #: ckanext/issues/controller/controller.py:407 msgid "You must be logged in clear abuse reports" -msgstr "Ви повинні бути авторизовані, щоб розглянути скаргу" - - +msgstr "Ви повинні увійти в систему, щоб розглянути скаргу" #: ckanext/issues/controller/controller.py:425 msgid "Spam/abuse report cleared" -msgstr "Спам/скарга на образу були розглянуті" - - +msgstr "Спам/скаргу розглянуто" #: ckanext/issues/controller/controller.py:430 msgid "You must be logged in to clear abuse reports" -msgstr "Ви повинні бути авторизовані, щоб розглянути скаргу" - - - +msgstr "Ви повинні увійти в систему, щоб розглянути скаргу" #: ckanext/issues/controller/controller.py:447 #: ckanext/issues/controller/controller.py:487 msgid "Validation error: {0}" msgstr "Помилка перевірки: {0}" - - #: ckanext/issues/controller/moderation.py:17 #: ckanext/issues/controller/moderation.py:76 msgid "Organization not found" -msgstr "Організація не знайдена" - - +msgstr "Розпорядника не знайдено" #: ckanext/issues/controller/moderation.py:22 msgid "You must be logged in to moderate issues" -msgstr "Ви повинні бути авторизовані, щоб модерувати скарги" - - +msgstr "Ви повинні увійти в систему, щоб опрацювати скарги" #: ckanext/issues/controller/moderation.py:29 msgid "Issue permanently hidden" msgstr "Скаргу приховано назавжди" - - #: ckanext/issues/controller/moderation.py:33 msgid "All issue reports cleared" msgstr "Усі скарги розглянуті" #: ckanext/issues/controller/moderation.py:81 msgid "You must be logged in to moderate comment" -msgstr "Ви повинні авторизуватися для модеруваня коментаря" +msgstr "Ви повинні увійти в систему, щоб розглянути коментар" #: ckanext/issues/controller/moderation.py:88 msgid "Comment permanently hidden" @@ -294,11 +212,11 @@ msgstr "[{site_title} Скарга] {dataset}" #: ckanext/issues/logic/action/action.py:63 msgid "Issue does not exist" -msgstr "Скарги не існує" +msgstr "Такої скарги не існує" #: ckanext/issues/logic/action/action.py:83 msgid "Issue marked as spam/abuse" -msgstr "Скарга помічена як спам/образа" +msgstr "Скаргу помічено, як спам/зловживання" #: ckanext/issues/logic/action/action.py:554 msgid "Issue has already been reported by this user" @@ -306,7 +224,7 @@ msgstr "Скарга вже була подана цим користуваче #: ckanext/issues/logic/validators/validators.py:13 msgid "{0} is not a valid status" -msgstr "{0} невірний статус" +msgstr "{0} неправильний статус" #: ckanext/issues/logic/validators/validators.py:44 #: ckanext/issues/logic/validators/validators.py:55 @@ -319,28 +237,28 @@ msgstr "Набір даних" #: ckanext/issues/logic/validators/validators.py:56 msgid "Organization" -msgstr "Організація" +msgstr "Розпорядник" #: ckanext/issues/logic/validators/validators.py:65 #: ckanext/issues/logic/validators/validators.py:78 msgid "Issue not found" -msgstr "Скарга не знайдена" +msgstr "Скаргу не знайдено" #: ckanext/issues/logic/validators/validators.py:87 msgid "Issue Comment not found" -msgstr "Коментар до скарги не знайдений" +msgstr "Коментар до скарги не знайдено" #: ckanext/issues/public/scripts/autocomplete-action-api.js:31 msgid "No matches found" -msgstr "Співпадінь немає" +msgstr "Збігів не знайдено" #: ckanext/issues/public/scripts/autocomplete-action-api.js:32 -msgid "Start typing…" -msgstr "Почати" +msgid "Start typing…" +msgstr "" #: ckanext/issues/public/scripts/autocomplete-action-api.js:34 msgid "Input is too short, must be at least one character" -msgstr "Ввід занадто короткий, має бути щонайменьше один знак" +msgstr "Вхідні дані - занадто короткі. Слід ввести щонайменше один символ" #: ckanext/issues/templates/issues/add.html:3 #: ckanext/issues/templates/issues/add.html:5 @@ -351,7 +269,7 @@ msgstr "Нова скарга" #: ckanext/issues/templates/issues/add.html:16 #: ckanext/issues/templates/issues/edit.html:14 msgid "The form contains invalid entries:" -msgstr "Форма містить неправильні знаки:" +msgstr "Форма містить неправильні записи:" #: ckanext/issues/templates/issues/add.html:27 #: ckanext/issues/templates/issues/edit.html:25 @@ -383,6 +301,10 @@ msgstr "Створити" msgid "All Issues" msgstr "Всі скарги" +#: ckanext/issues/templates/issues/all_issues.html:24 +msgid "There are currently no issues" +msgstr "" + #: ckanext/issues/templates/issues/base.html:9 msgid "Datasets" msgstr "Набори даних" @@ -392,8 +314,8 @@ msgid "What are issues?" msgstr "Що таке скарги?" #: ckanext/issues/templates/issues/base_form_page.html:16 -msgid "

    Issues are ... .

    " -msgstr "

    Скарги – це ... .

    " +msgid "Issues are the system for getting feedback about datasets." +msgstr "Скарги — це зворотній звя'зок між розпорядниками та користувачами." #: ckanext/issues/templates/issues/comment_moderation.html:8 #: ckanext/issues/templates/issues/moderation.html:8 @@ -409,14 +331,30 @@ msgstr "Розпорядники" #: ckanext/issues/templates/issues/comment_moderation.html:68 #: ckanext/issues/templates/issues/moderation.html:69 msgid "Not abuse" -msgstr "Не образа" +msgstr "Це не образа" -#: ckanext/issues/templates/issues/common.html:30 +#: ckanext/issues/templates/issues/common.html:18 #: ckanext/issues/templates/issues/organization_issues.html:76 #, python-format msgid "%s comments" msgstr "%s коментарі" +#: ckanext/issues/templates/issues/common.html:25 +msgid "Spam/Abuse - hidden from normal users" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:29 +msgid "Reported by you to admins" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:38 +msgid "Status" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:52 +msgid "Visibility" +msgstr "" + #: ckanext/issues/templates/issues/confirm_delete.html:3 #: ckanext/issues/templates/issues/confirm_delete.html:15 msgid "Confirm Delete" @@ -439,16 +377,7 @@ msgstr "Скарги" msgid "Search issues..." msgstr "Шукати скарги..." -#: ckanext/issues/templates/issues/dataset.html:28 -#: ckanext/issues/templates/issues/organization_issues.html:29 -#: ckanext/issues/templates/snippets/search_result_text.html:5 -msgid "{number} issue found" -msgid_plural "{number} issues found" -msgstr[0] "{number} скарг знайдено" -msgstr[1] "{number} скарг знайдено" -msgstr[2] "{number} скарг знайдено" - -#: ckanext/issues/templates/issues/dataset.html:38 +#: ckanext/issues/templates/issues/dataset.html:35 msgid "No issues" msgstr "Скарг немає" @@ -461,104 +390,180 @@ msgstr "Редагувати скаргу" msgid "Update" msgstr "Оновити" -#: ckanext/issues/templates/issues/show.html:125 +#: ckanext/issues/templates/issues/organization_issues.html:29 +#: ckanext/issues/templates/snippets/search_result_text.html:5 +msgid "{number} issue found" +msgid_plural "{number} issues found" +msgstr[0] "{number} скарга знайдена" +msgstr[1] "{number} скарги знайдено" +msgstr[2] "{number} скарг знайдено" + +#: ckanext/issues/templates/issues/show.html:76 +msgid "Owner" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:81 +msgid "commented" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:100 +msgid "Report abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:111 +msgid "You have reported this as abuse, cancel the report" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:112 +#: ckanext/issues/templates/issues/show.html:128 +msgid "Flag" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:127 +msgid "Mark as spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:140 +msgid "Mark as NOT spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:141 msgid "Not spam/abuse" -msgstr "Не спам/образа" +msgstr "Не є спамом чи зловживанням" + +#: ckanext/issues/templates/issues/show.html:149 +msgid "user reports this is spam/abuse" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:154 +msgid "Hidden from normal users" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:159 +msgid "Moderated" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:178 +msgid "opened this issue" +msgstr "" -#: ckanext/issues/templates/issues/show.html:174 +#: ckanext/issues/templates/issues/show.html:179 msgid "{number} comment" msgid_plural "{number} comments" -msgstr[0] "{number} комментарів" -msgstr[1] "{number} комментарів" -msgstr[2] "{number} комментарів" +msgstr[0] "{number} коментар" +msgstr[1] "{number} коментарі" +msgstr[2] "{number} коментарів" -#: ckanext/issues/templates/issues/show.html:208 +#: ckanext/issues/templates/issues/show.html:204 +msgid "Leave a comment" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:207 +msgid "You can use Markdown formatting here" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:213 msgid "Are you sure you want to delete this issue?" msgstr "Ви впевнені, що хочете видалити цю скаргу?" -#: ckanext/issues/templates/issues/show.html:209 +#: ckanext/issues/templates/issues/show.html:214 msgid "Delete" msgstr "Видалити" -#: ckanext/issues/templates/issues/show.html:214 +#: ckanext/issues/templates/issues/show.html:219 msgid "Close" msgstr "Закрити" -#: ckanext/issues/templates/issues/show.html:218 +#: ckanext/issues/templates/issues/show.html:223 msgid "Re-open" msgstr "Відкрити знову" -#: ckanext/issues/templates/issues/show.html:224 +#: ckanext/issues/templates/issues/show.html:229 msgid "Comment" msgstr "Коментар" -#: ckanext/issues/templates/issues/show.html:231 +#: ckanext/issues/templates/issues/show.html:236 msgid "Login to comment" msgstr "Увійдіть, щоб коментувати" -#: ckanext/issues/templates/issues/show.html:256 +#: ckanext/issues/templates/issues/show.html:247 +msgid "All issues of dataset" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:247 +msgid "All issues of this dataset" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:255 +msgid "Assignee" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:262 msgid "This issue has been assigned to an administrator for the publisher" msgstr "Ця скарга була закріплена за адміністратором розпорядника" -#: ckanext/issues/templates/issues/show.html:258 +#: ckanext/issues/templates/issues/show.html:264 msgid "No one" msgstr "Нікого" -#: ckanext/issues/templates/issues/show.html:279 +#: ckanext/issues/templates/issues/show.html:270 +msgid "Change Assignee" +msgstr "" + +#: ckanext/issues/templates/issues/show.html:280 msgid "Assign" msgstr "Закріпити" -#: ckanext/issues/templates/issues/email/new_comment.html:4 -#: ckanext/issues/templates/issues/email/new_issue.html:4 -msgid "The dataset is: " -msgstr "Набір даних: " - #: ckanext/issues/templates/issues/email/new_issue.html:2 msgid "On" -msgstr "Вкл" +msgstr "Увімк" #: ckanext/issues/templates/issues/email/new_issue.html:2 msgid "a user has raised an issue with one of the datasets from organization" -msgstr "користувач почав обговорення набору даних організації" +msgstr "користувач почав обговорення скарги з одного з наборів даних розпорядника" -#: ckanext/issues/templates/issues/email/new_issue.html:5 +#: ckanext/issues/templates/issues/email/new_issue.html:4 +msgid "The dataset is: " +msgstr "Набір даних: " + +#: ckanext/issues/templates/issues/email/new_issue.html:6 msgid "The issue is:" msgstr "Скарга: " -#: ckanext/issues/templates/issues/email/new_issue.html:10 +#: ckanext/issues/templates/issues/email/new_issue.html:11 msgid "Please correct the problem or add an initial comment about the issue at: " -msgstr "Будь ласка вирішіть проблему чи додайте перший коментар до скарги: " +msgstr "Будь ласка, вирішіть проблему чи додайте перший коментар до скарги: " -#: ckanext/issues/templates/issues/email/new_issue.html:12 +#: ckanext/issues/templates/issues/email/new_issue.html:13 msgid "Thank you," msgstr "Дякуємо," -#: ckanext/issues/templates/issues/email/new_issue.html:14 +#: ckanext/issues/templates/issues/email/new_issue.html:15 msgid "The" msgstr "" -#: ckanext/issues/templates/issues/email/new_issue.html:14 +#: ckanext/issues/templates/issues/email/new_issue.html:15 msgid "team" msgstr "команда" -#: ckanext/issues/templates/issues/email/new_issue.html:18 +#: ckanext/issues/templates/issues/email/new_issue.html:19 msgid "Issue:" msgstr "Скарга:" -#: ckanext/issues/templates/issues/email/new_issue.html:19 +#: ckanext/issues/templates/issues/email/new_issue.html:20 msgid "Dataset:" msgstr "Набір даних:" -#: ckanext/issues/templates/issues/email/new_issue.html:20 +#: ckanext/issues/templates/issues/email/new_issue.html:21 msgid "User:" msgstr "Користувач:" #: ckanext/issues/templates/snippets/search_result_text.html:3 msgid "{number} issue found for \"{query}\"" msgid_plural "{number} issues found for \"{query}\"" -msgstr[0] "{number} скарг знайдено по \"{query}\" -msgstr[1] "{number} скарг знайдено по \"{query}\" -msgstr[2] "{number} скарг знайдено по \"{query}\" +msgstr[0] "{number} скарга знайдена по \"{query}\\" +msgstr[1] "{number} скарги знайдено по \"{query}\\" +msgstr[2] "{number} скарг знайдено по \"{query}\\" #: ckanext/issues/templates/snippets/search_result_text.html:4 msgid "No issues found for \"{query}\"" @@ -567,3 +572,10 @@ msgstr "Скарги на \"{query}\" не знайдені" #: ckanext/issues/templates/snippets/search_result_text.html:6 msgid "No issues found" msgstr "Скарги не знайдені" + +#~ msgid "Start typing…" +#~ msgstr "Вводьте текст" + +#~ msgid "

    Issues are ... .

    " +#~ msgstr "

    Скарги – це ... .

    " + diff --git a/ckanext/issues/templates/issues/base_form_page.html b/ckanext/issues/templates/issues/base_form_page.html index b96c9acc..bad1dc9a 100644 --- a/ckanext/issues/templates/issues/base_form_page.html +++ b/ckanext/issues/templates/issues/base_form_page.html @@ -13,7 +13,7 @@

    {% block page_heading %}{% endblock %}

    {{ _('What are issues?') }}

    -

    {% trans %}Issues are ... .{% endtrans %}

    +

    {% trans %}Issues are the system for getting feedback about datasets.{% endtrans %}

    {% endblock %} From 41baeac82d2ff7495bc66561167f110349a4f162 Mon Sep 17 00:00:00 2001 From: DaleDMT Date: Mon, 21 May 2018 14:01:14 +0300 Subject: [PATCH 14/29] Clean html in templates --- .../templates/issues/email/new_comment.html | 22 +++++++++---------- .../templates/issues/email/new_issue.html | 20 ++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ckanext/issues/templates/issues/email/new_comment.html b/ckanext/issues/templates/issues/email/new_comment.html index 23fb06fa..ef7c9dbd 100644 --- a/ckanext/issues/templates/issues/email/new_comment.html +++ b/ckanext/issues/templates/issues/email/new_comment.html @@ -1,19 +1,19 @@ -

    {% trans %}A user {{ user.fullname }} has added a comment to one of your issues on {{ site_title }}.{% endtrans %}

    +{% trans %}A user {{ user.fullname }} has added a comment to one of your issues on {{ site_title }}.{% endtrans %} -

    {% trans %}The dataset is{% endtrans %}: {{ dataset.title }}
    -{% trans %}The issue is{% endtrans %}: {{ issue_subject }}
    -{% trans %}The comment is{% endtrans %}:
    +{% trans %}The dataset is{% endtrans %}: {{ dataset.title }} +{% trans %}The issue is{% endtrans %}: {{ issue_subject }} +{% trans %}The comment is{% endtrans %}: > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -

    -

    {% trans %}In order to respond to the comment, please see the issue at{% endtrans %}: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. {% trans %}Once the issue has been resolved, click 'Close issue'.{% endtrans %}

    -

    {% trans %}Thank you{% endtrans %}

    +{% trans %}In order to respond to the comment, please see the issue at{% endtrans %}: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. {% trans %}Once the issue has been resolved, click 'Close issue'.{% endtrans %} -

    {% trans %}The {{ site_title }} team{% endtrans %}

    +{% trans %}Thank you{% endtrans %} -

    --

    +{% trans %}The {{ site_title }} team{% endtrans %} -

    {% trans %}Issue{% endtrans %}: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}

    -

    {% trans %}Dataset{% endtrans %}: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }}

    +-- + +{% trans %}Issue{% endtrans %}: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +{% trans %}Dataset{% endtrans %}: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html index dc9acda0..91a08b8d 100644 --- a/ckanext/issues/templates/issues/email/new_issue.html +++ b/ckanext/issues/templates/issues/email/new_issue.html @@ -1,22 +1,22 @@ -

    {% trans %}On{% endtrans %} {{ site_title }} {% trans %}a user has raised an issue with one of the datasets from organization{% endtrans %} '{{ recipient.organization_title }}', for which you are an {{ recipient.capacity }}.' for which you are an {{ capacity }}.

    +{% trans %}On{% endtrans %} {{ site_title }} {% trans %}a user has raised an issue with one of the datasets from organization{% endtrans %} '{{ recipient.organization_title }}', for which you are an {{ recipient.capacity }}.' for which you are an {{ capacity }}. -

    {% trans %}The dataset is: {% endtrans %}{{ dataset.title }}

    +{% trans %}The dataset is: {% endtrans %}{{ dataset.title }} -

    {% trans %}The issue is:{% endtrans %} +{% trans %}The issue is:{% endtrans %} > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -

    -

    {% trans %}Please correct the problem or add an initial comment about the issue at: {% endtrans %}{{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.

    -

    {% trans %}Thank you,{% endtrans %}

    +{% trans %}Please correct the problem or add an initial comment about the issue at: {% endtrans %}{{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. -

    {% trans %}The{% endtrans %} {{ site_title }} {% trans %}team{% endtrans %}

    +{% trans %}Thank you,{% endtrans %} -

    --

    +{% trans %}The{% endtrans %} {{ site_title }} {% trans %}team{% endtrans %} -

    {% trans %}Issue:{% endtrans %} {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +-- + +{% trans %}Issue:{% endtrans %} {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} {% trans %}Dataset:{% endtrans %} {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} {% trans %}User:{% endtrans %} {{ user.fullname or user.name }} -

    + From 51fddef497fa536a9ba44e42c2ddc1b6bc570749 Mon Sep 17 00:00:00 2001 From: Oleg Serbokryl Date: Wed, 6 Jun 2018 16:07:19 +0300 Subject: [PATCH 15/29] Update translates (#10) * Updated translates * translated email, errors. Updated translates --- ckanext/issues/controller/controller.py | 2 +- ckanext/issues/i18n/ckanext-issues.pot | 24 ++- .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo | Bin 11682 -> 13345 bytes .../i18n/uk_UA/LC_MESSAGES/ckanext-issues.po | 201 ++++++++++-------- ckanext/issues/templates/issues/add.html | 4 +- ckanext/issues/templates/issues/common.html | 4 +- .../templates/issues/email/new_issue.html | 2 +- 7 files changed, 143 insertions(+), 94 deletions(-) diff --git a/ckanext/issues/controller/controller.py b/ckanext/issues/controller/controller.py index 5beae8f1..07e73eec 100644 --- a/ckanext/issues/controller/controller.py +++ b/ckanext/issues/controller/controller.py @@ -103,7 +103,7 @@ def new(self, dataset_id, resource_id=None): }) if not data_dict['title']: - c.error_summary['title'] = ["Please enter a title"] + c.error_summary[_('title')] = [_("Please enter a title")] c.errors = c.error_summary if not c.error_summary: # save and redirect diff --git a/ckanext/issues/i18n/ckanext-issues.pot b/ckanext/issues/i18n/ckanext-issues.pot index 0e2100c0..dc443bdf 100644 --- a/ckanext/issues/i18n/ckanext-issues.pot +++ b/ckanext/issues/i18n/ckanext-issues.pot @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-issues 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-05-16 16:14+0000\n" +"POT-Creation-Date: 2018-06-06 13:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.3.4\n" +"Generated-By: Babel 2.5.3\n" #: ckanext/issues/auth.py:20 msgid "User {0} not authorized for action on issue {1}" @@ -58,6 +58,14 @@ msgstr "" msgid "Not authorized to add a new issue" msgstr "" +#: ckanext/issues/controller/controller.py:106 +msgid "title" +msgstr "" + +#: ckanext/issues/controller/controller.py:106 +msgid "Please enter a title" +msgstr "" + #: ckanext/issues/controller/controller.py:113 msgid "Your issue has been registered, thank you for the feedback" msgstr "" @@ -330,6 +338,14 @@ msgstr "" msgid "Not abuse" msgstr "" +#: ckanext/issues/templates/issues/common.html:12 +msgid "Opened by" +msgstr "" + +#: ckanext/issues/templates/issues/common.html:14 +msgid "updated" +msgstr "" + #: ckanext/issues/templates/issues/common.html:18 #: ckanext/issues/templates/issues/organization_issues.html:76 #, python-format @@ -529,6 +545,10 @@ msgstr "" msgid "Please correct the problem or add an initial comment about the issue at: " msgstr "" +#: ckanext/issues/templates/issues/email/new_issue.html:11 +msgid "Once the issue has been resolved, click 'Close issue'." +msgstr "" + #: ckanext/issues/templates/issues/email/new_issue.html:13 msgid "Thank you," msgstr "" diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.mo index 85b7775dabbc95f73848ccdacf59273dc0665dcc..def316910e4f611e5e59a1de158ae88715450389 100644 GIT binary patch literal 13345 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 delta 3589 zcma*ne{7Z29mnz0AAqHl+h3GhpzYJrTTAH=3I*2MfxrM;>V^_;Vd9+l9G zI1k^zTzm&Libn3f_h4*XpDGDs>kP%IE}Y#;0&2 zzKlxnIx0Xay&SB-O5BFE_#ITBAE7Gw9BSNOV-0?UYj6o0LgVd3EyeB-7s{*`dB=Pg zOY!@tH4Wo3{3|M81`DbC1}w++xIe%$?q5XhjjLFQevZgyT#H(=0c0q147JHaPjR7= zpGK8-9F_T7Sb?A77A&Lw?Qj_pYOMe=cRY9c!=! z2ap^?=5;O{8m^+w=k>`4W)5eMs+&c~vYHB1h3Zi=YQ|e}7s5%ZN_( z%wbeOi%RG$Ukdp1xL1+lnNKi)xvY;iaRaInLDVrl6u&>ZG&K2x@F)%11H-6Yd;zuT z{*F}D{0F-*m$RuE45IeHqqrYaiFN=x@Z0zns(&+QQVHzFyYM0G!FTZxZVR#SD$%P* zoB0DOz;)D&)7S{aFacBvn{h7=#C;q0ale+WuJ)7Ii4(X5?(y|-W=_b2cSCRatqZd#TUxt5lZWRo&;B3bE2Q|xc& zACDaHrKCiTWS1sKew@21Y3}N(+BHt?nuglC$h8GMNhzzU>ul@7FVBk&x?^rQ_JA94 zqxRB5XKtdwX8CjS+;QVR6B~?;IEe?mndQ&3{A8~-ioQzOKN>@WRWJwwvq}W>fyrrL}%`2rV=a6%WiOvtQeTyt+J@B zZYoA>$Z>y4isSC6E=OY{1iMiS*1_|l*2br`@wUBEw6e)_uV^#1KI(>;5asQsPVa9#A-CLZW-4blOH|VrE-{|e`4)z>myI5bD-#%BIXYb3X zup3M2i*E025B9Yk47MBhlx9aUS%Mq;E^L2N;xC>`{PRUpg{QBNRyWrd8=0PDV5vKO z3#66anRM0;JGu6w(xzEoJKPiOvzr3F^F8sR4UYXJu-Vg(_1a!mFmFfjKyTkcr)~eC z{-8ZmR%#=@MXTI1Wc)mv^2&@eVB8DrV@-mM>YY#2Uh`Efpq4+Q*X5c-WWum)$?mwV z%Jf^OyengB(kz8zpU5oAa?i(3cn1sHiSlVv9Jha5wky*+sMguOTCv`Hbf2o|@Fm_+ zNyBz~ahYAe{6o*YX&(p|W3fDYa;vLJlk5R|tGxx=@72on~IZkBlrs?Cf)^4@; z=PsE~a^u=E%#)?EmvRGk-^!toCq#JiXocOEcta;4Y>xCC>fRsh8<;k$nXiq1(QE(L VOXTs;s)}j(K2}$p^9509{vY&Q3KakV diff --git a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po index 1b079b4e..1a881826 100644 --- a/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po +++ b/ckanext/issues/i18n/uk_UA/LC_MESSAGES/ckanext-issues.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-issues 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-05-16 16:14+0000\n" +"POT-Creation-Date: 2018-06-06 13:03+0000\n" "PO-Revision-Date: 2018-03-20 22:22+0000\n" "Last-Translator: FULL NAME \n" "Language: uk_UA\n" @@ -18,11 +18,11 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.3.4\n" +"Generated-By: Babel 2.5.3\n" #: ckanext/issues/auth.py:20 msgid "User {0} not authorized for action on issue {1}" -msgstr "Користувач {0} не має достатньо прав для роботи зі скаргами {1}" +msgstr "Користувач {0} не має достатньо прав для роботи зі пропозиціями {1}" #: ckanext/issues/auth.py:42 msgid "User {0} not authorized for action" @@ -30,11 +30,11 @@ msgstr "Користувач {0} не має достатньо прав для #: ckanext/issues/auth.py:91 msgid "User {user} not authorized for action on issue {issue}" -msgstr "Користувач {user} не має достатньо прав для роботи зі скаргами {issue}" +msgstr "Користувач {user} не має достатньо прав для роботи зі пропозиціями {issue}" #: ckanext/issues/controller/controller.py:48 msgid "Issues have not been enabled for this dataset" -msgstr "Скарги недоступні для цього набору даних" +msgstr "Пропозиції недоступні для цього набору даних" #: ckanext/issues/controller/controller.py:51 #: ckanext/issues/controller/controller.py:69 @@ -43,32 +43,40 @@ msgstr "Набір даних не знайдено" #: ckanext/issues/controller/controller.py:54 msgid "Unauthorized to view issues for this dataset" -msgstr "У вас немає доступу для перегляду скарг по цьому набору даних" +msgstr "У вас немає доступу для перегляду пропозицій по цьому набору даних" #: ckanext/issues/controller/controller.py:66 msgid "Issues have not been enabled for this organization" -msgstr "Скарги недоступні для цього розпорядника" +msgstr "Пропозиції недоступні для цього розпорядника" #: ckanext/issues/controller/controller.py:72 msgid "Unauthorized to view issues for this organization" -msgstr "У вас немає доступу для перегляду скарг на цього розпорядника" +msgstr "У вас немає доступу для перегляду пропозицій на цього розпорядника" #: ckanext/issues/controller/controller.py:77 msgid "Please login to add a new issue" -msgstr "Будь ласка, увійдіть, щоб додати нову скаргу" +msgstr "Будь ласка, увійдіть, щоб додати нову пропозицію" #: ckanext/issues/controller/controller.py:86 msgid "Not authorized to add a new issue" -msgstr "У вас немає доступу для додавання нової скарги" +msgstr "У вас немає доступу для додавання нової пропозиції" + +#: ckanext/issues/controller/controller.py:106 +msgid "title" +msgstr "Назва" + +#: ckanext/issues/controller/controller.py:106 +msgid "Please enter a title" +msgstr "Будь ласка, введіть назву" #: ckanext/issues/controller/controller.py:113 msgid "Your issue has been registered, thank you for the feedback" -msgstr "Ваша скарга була зареєстрована. Дякуємо за зворотній зв'язок" +msgstr "Ваша пропозиція була зареєстрована. Дякуємо за зворотній зв'язок" #: ckanext/issues/controller/controller.py:131 #: ckanext/issues/controller/controller.py:134 msgid "Issue not found: {0}" -msgstr "Скаргу не знайдено: {0}" +msgstr "Пропозицію не знайдено: {0}" #: ckanext/issues/controller/controller.py:178 msgid "Invalid request" @@ -84,19 +92,19 @@ msgstr "Поле \"Комментар\" не може бути порожнім" #: ckanext/issues/controller/controller.py:215 msgid "Issue closed" -msgstr "Скаргу закрито" +msgstr "Пропозицію закрито" #: ckanext/issues/controller/controller.py:217 msgid "Issue re-opened" -msgstr "Скаргу знову відкрито" +msgstr "Пропозицію знову відкрито" #: ckanext/issues/controller/controller.py:255 msgid "Unauthorized to delete issue {0}" -msgstr "У вас недостатньо прав доступу, щоб видалити скаргу {0}" +msgstr "У вас недостатньо прав доступу, щоб видалити пропозицію {0}" #: ckanext/issues/controller/controller.py:260 msgid "Issue {0} has been deleted." -msgstr "Скаргу {0} видалено." +msgstr "Пропозицію {0} видалено." #: ckanext/issues/controller/controller.py:278 msgid "User {0} does not exist" @@ -108,11 +116,11 @@ msgstr "Закріплена за {user}" #: ckanext/issues/controller/controller.py:308 msgid "Unauthorized to assign users to issue" -msgstr "У вас немає прав доступу для закріплення користувачів за скаргою" +msgstr "У вас немає прав доступу для закріплення користувачів за пропозицією" #: ckanext/issues/controller/controller.py:322 msgid "You must be logged in to report issues" -msgstr "Ви повинні увійти, щоб подавати скарги" +msgstr "Ви повинні увійти, щоб подавати пропозиції" #: ckanext/issues/controller/controller.py:333 #: ckanext/issues/controller/controller.py:370 @@ -126,15 +134,15 @@ msgstr "Позначено як зловживання/спам." #: ckanext/issues/controller/controller.py:337 msgid "Issue is visible." -msgstr "Скарга - видима." +msgstr "Пропозиція - видима." #: ckanext/issues/controller/controller.py:339 msgid "Issue is invisible to normal users." -msgstr "Скарга - невидима для звичайних користувачів." +msgstr "Пропозиція - невидима для звичайних користувачів." #: ckanext/issues/controller/controller.py:342 msgid "Issue reported to an administrator" -msgstr "Скаргу надіслано адміністратору" +msgstr "Пропозицію надіслано адміністратору" #: ckanext/issues/controller/controller.py:358 msgid "You must be logged in to report comments" @@ -154,19 +162,19 @@ msgstr "Коментар надіслано адміністратору" #: ckanext/issues/controller/controller.py:402 msgid "Issue report cleared" -msgstr "Скаргу розглянуто" +msgstr "Пропозицію розглянуто" #: ckanext/issues/controller/controller.py:407 msgid "You must be logged in clear abuse reports" -msgstr "Ви повинні увійти в систему, щоб розглянути скаргу" +msgstr "Ви повинні увійти в систему, щоб розглянути пропозицію" #: ckanext/issues/controller/controller.py:425 msgid "Spam/abuse report cleared" -msgstr "Спам/скаргу розглянуто" +msgstr "Спам/пропозицію розглянуто" #: ckanext/issues/controller/controller.py:430 msgid "You must be logged in to clear abuse reports" -msgstr "Ви повинні увійти в систему, щоб розглянути скаргу" +msgstr "Ви повинні увійти в систему, щоб розглянути пропозицію" #: ckanext/issues/controller/controller.py:447 #: ckanext/issues/controller/controller.py:487 @@ -180,15 +188,15 @@ msgstr "Розпорядника не знайдено" #: ckanext/issues/controller/moderation.py:22 msgid "You must be logged in to moderate issues" -msgstr "Ви повинні увійти в систему, щоб опрацювати скарги" +msgstr "Ви повинні увійти в систему, щоб опрацювати пропозиції" #: ckanext/issues/controller/moderation.py:29 msgid "Issue permanently hidden" -msgstr "Скаргу приховано назавжди" +msgstr "Пропозицію приховано назавжди" #: ckanext/issues/controller/moderation.py:33 msgid "All issue reports cleared" -msgstr "Усі скарги розглянуті" +msgstr "Усі пропозиції розглянуті" #: ckanext/issues/controller/moderation.py:81 msgid "You must be logged in to moderate comment" @@ -200,7 +208,7 @@ msgstr "Коментар приховано назавжди" #: ckanext/issues/controller/moderation.py:92 msgid "All comment reports cleared" -msgstr "Всі коментарі до скарг розглянуто" +msgstr "Всі коментарі до пропозиції розглянуто" #: ckanext/issues/controller/show.py:18 msgid "No description provided" @@ -208,19 +216,19 @@ msgstr "Опису немає" #: ckanext/issues/lib/helpers.py:202 msgid "[{site_title} Issue] {dataset}" -msgstr "[{site_title} Скарга] {dataset}" +msgstr "[{site_title} Пропозиція] {dataset}" #: ckanext/issues/logic/action/action.py:63 msgid "Issue does not exist" -msgstr "Такої скарги не існує" +msgstr "Такої пропозиції не існує" #: ckanext/issues/logic/action/action.py:83 msgid "Issue marked as spam/abuse" -msgstr "Скаргу помічено, як спам/зловживання" +msgstr "Пропозицію помічено, як спам/зловживання" #: ckanext/issues/logic/action/action.py:554 msgid "Issue has already been reported by this user" -msgstr "Скарга вже була подана цим користувачем" +msgstr "Пропозиція вже була подана цим користувачем" #: ckanext/issues/logic/validators/validators.py:13 msgid "{0} is not a valid status" @@ -242,11 +250,11 @@ msgstr "Розпорядник" #: ckanext/issues/logic/validators/validators.py:65 #: ckanext/issues/logic/validators/validators.py:78 msgid "Issue not found" -msgstr "Скаргу не знайдено" +msgstr "Пропозицію не знайдено" #: ckanext/issues/logic/validators/validators.py:87 msgid "Issue Comment not found" -msgstr "Коментар до скарги не знайдено" +msgstr "Коментар до пропозиції не знайдено" #: ckanext/issues/public/scripts/autocomplete-action-api.js:31 msgid "No matches found" @@ -254,7 +262,7 @@ msgstr "Збігів не знайдено" #: ckanext/issues/public/scripts/autocomplete-action-api.js:32 msgid "Start typing…" -msgstr "" +msgstr "Почав писати..." #: ckanext/issues/public/scripts/autocomplete-action-api.js:34 msgid "Input is too short, must be at least one character" @@ -264,7 +272,7 @@ msgstr "Вхідні дані - занадто короткі. Слід ввес #: ckanext/issues/templates/issues/add.html:5 #: ckanext/issues/templates/issues/dataset.html:22 msgid "New Issue" -msgstr "Нова скарга" +msgstr "Нова пропозиція" #: ckanext/issues/templates/issues/add.html:16 #: ckanext/issues/templates/issues/edit.html:14 @@ -299,11 +307,11 @@ msgstr "Створити" #: ckanext/issues/templates/issues/all_issues.html:5 #: ckanext/issues/templates/issues/all_issues.html:12 msgid "All Issues" -msgstr "Всі скарги" +msgstr "Всі пропозиції" #: ckanext/issues/templates/issues/all_issues.html:24 msgid "There are currently no issues" -msgstr "" +msgstr "Наразі немає жодних пропозицій" #: ckanext/issues/templates/issues/base.html:9 msgid "Datasets" @@ -311,16 +319,16 @@ msgstr "Набори даних" #: ckanext/issues/templates/issues/base_form_page.html:14 msgid "What are issues?" -msgstr "Що таке скарги?" +msgstr "Що таке пропозиції?" #: ckanext/issues/templates/issues/base_form_page.html:16 msgid "Issues are the system for getting feedback about datasets." -msgstr "Скарги — це зворотній звя'зок між розпорядниками та користувачами." +msgstr "Пропозиції — це зворотній звя'зок між розпорядниками та користувачами." #: ckanext/issues/templates/issues/comment_moderation.html:8 #: ckanext/issues/templates/issues/moderation.html:8 msgid "Reported issues" -msgstr "Подані скарги" +msgstr "Подані пропозиції" #: ckanext/issues/templates/issues/comment_moderation.html:28 #: ckanext/issues/templates/issues/moderation.html:28 @@ -333,6 +341,14 @@ msgstr "Розпорядники" msgid "Not abuse" msgstr "Це не образа" +#: ckanext/issues/templates/issues/common.html:12 +msgid "Opened by" +msgstr "Створив" + +#: ckanext/issues/templates/issues/common.html:14 +msgid "updated" +msgstr "оновлено" + #: ckanext/issues/templates/issues/common.html:18 #: ckanext/issues/templates/issues/organization_issues.html:76 #, python-format @@ -341,19 +357,19 @@ msgstr "%s коментарі" #: ckanext/issues/templates/issues/common.html:25 msgid "Spam/Abuse - hidden from normal users" -msgstr "" +msgstr "Спам/Зловживання - приховано від звичайних користувачів" #: ckanext/issues/templates/issues/common.html:29 msgid "Reported by you to admins" -msgstr "" +msgstr "Ваше повідомлення надіслане адміністратору." #: ckanext/issues/templates/issues/common.html:38 msgid "Status" -msgstr "" +msgstr "Статус" #: ckanext/issues/templates/issues/common.html:52 msgid "Visibility" -msgstr "" +msgstr "Відкритість" #: ckanext/issues/templates/issues/confirm_delete.html:3 #: ckanext/issues/templates/issues/confirm_delete.html:15 @@ -362,7 +378,7 @@ msgstr "Підтвердити видалення" #: ckanext/issues/templates/issues/confirm_delete.html:11 msgid "Are you sure you want to delete issue - {0}?" -msgstr "Ви впевнені, що хочете видалити скаргу - {0}?" +msgstr "Ви впевнені, що хочете видалити пропозицію - {0}?" #: ckanext/issues/templates/issues/dataset.html:14 #: ckanext/issues/templates/issues/dataset.html:20 @@ -370,21 +386,21 @@ msgstr "Ви впевнені, що хочете видалити скаргу - #: ckanext/issues/templates/issues/organization_issues.html:22 #: ckanext/issues/templates/issues/show.html:13 msgid "Issues" -msgstr "Скарги" +msgstr "Пропозиції" #: ckanext/issues/templates/issues/dataset.html:26 #: ckanext/issues/templates/issues/organization_issues.html:27 msgid "Search issues..." -msgstr "Шукати скарги..." +msgstr "Шукати пропозиції..." #: ckanext/issues/templates/issues/dataset.html:35 msgid "No issues" -msgstr "Скарг немає" +msgstr "Пропозицій немає" #: ckanext/issues/templates/issues/edit.html:3 #: ckanext/issues/templates/issues/edit.html:5 msgid "Edit Issue" -msgstr "Редагувати скаргу" +msgstr "Редагувати пропозицію" #: ckanext/issues/templates/issues/edit.html:36 msgid "Update" @@ -394,38 +410,38 @@ msgstr "Оновити" #: ckanext/issues/templates/snippets/search_result_text.html:5 msgid "{number} issue found" msgid_plural "{number} issues found" -msgstr[0] "{number} скарга знайдена" -msgstr[1] "{number} скарги знайдено" -msgstr[2] "{number} скарг знайдено" +msgstr[0] "{number} пропозицію знайдена" +msgstr[1] "{number} пропозиції знайдено" +msgstr[2] "{number} пропозицій знайдено" #: ckanext/issues/templates/issues/show.html:76 msgid "Owner" -msgstr "" +msgstr "Власник" #: ckanext/issues/templates/issues/show.html:81 msgid "commented" -msgstr "" +msgstr "прокоментовано" #: ckanext/issues/templates/issues/show.html:100 msgid "Report abuse" -msgstr "" +msgstr "Повідомити про зловживання" #: ckanext/issues/templates/issues/show.html:111 msgid "You have reported this as abuse, cancel the report" -msgstr "" +msgstr "Ваше повідомлення про зловживання зафіксовано. Бажаєте скасувати запит?" #: ckanext/issues/templates/issues/show.html:112 #: ckanext/issues/templates/issues/show.html:128 msgid "Flag" -msgstr "" +msgstr "Cигналізувати" #: ckanext/issues/templates/issues/show.html:127 msgid "Mark as spam/abuse" -msgstr "" +msgstr "Помітити це як спам/зловживання" #: ckanext/issues/templates/issues/show.html:140 msgid "Mark as NOT spam/abuse" -msgstr "" +msgstr "Помітити це як НЕ спам/зловживання" #: ckanext/issues/templates/issues/show.html:141 msgid "Not spam/abuse" @@ -433,19 +449,19 @@ msgstr "Не є спамом чи зловживанням" #: ckanext/issues/templates/issues/show.html:149 msgid "user reports this is spam/abuse" -msgstr "" +msgstr "користувач помітив це як спам/зловживання" #: ckanext/issues/templates/issues/show.html:154 msgid "Hidden from normal users" -msgstr "" +msgstr "Приховано від звичайних користувачів" #: ckanext/issues/templates/issues/show.html:159 msgid "Moderated" -msgstr "" +msgstr "Змодеровано" #: ckanext/issues/templates/issues/show.html:178 msgid "opened this issue" -msgstr "" +msgstr "створив пропозицію" #: ckanext/issues/templates/issues/show.html:179 msgid "{number} comment" @@ -456,15 +472,15 @@ msgstr[2] "{number} коментарів" #: ckanext/issues/templates/issues/show.html:204 msgid "Leave a comment" -msgstr "" +msgstr "Залишити коментар" #: ckanext/issues/templates/issues/show.html:207 msgid "You can use Markdown formatting here" -msgstr "" +msgstr "Тут можете використовувати форматування." #: ckanext/issues/templates/issues/show.html:213 msgid "Are you sure you want to delete this issue?" -msgstr "Ви впевнені, що хочете видалити цю скаргу?" +msgstr "Ви впевнені, що хочете видалити цю пропозицію?" #: ckanext/issues/templates/issues/show.html:214 msgid "Delete" @@ -488,19 +504,19 @@ msgstr "Увійдіть, щоб коментувати" #: ckanext/issues/templates/issues/show.html:247 msgid "All issues of dataset" -msgstr "" +msgstr "Всі пропозиції набору даних" #: ckanext/issues/templates/issues/show.html:247 msgid "All issues of this dataset" -msgstr "" +msgstr "Всі пропозиції" #: ckanext/issues/templates/issues/show.html:255 msgid "Assignee" -msgstr "" +msgstr "Призначено" #: ckanext/issues/templates/issues/show.html:262 msgid "This issue has been assigned to an administrator for the publisher" -msgstr "Ця скарга була закріплена за адміністратором розпорядника" +msgstr "Ця пропозиція була закріплена за адміністратором розпорядника" #: ckanext/issues/templates/issues/show.html:264 msgid "No one" @@ -508,7 +524,7 @@ msgstr "Нікого" #: ckanext/issues/templates/issues/show.html:270 msgid "Change Assignee" -msgstr "" +msgstr "Змінити уповноваженого" #: ckanext/issues/templates/issues/show.html:280 msgid "Assign" @@ -520,7 +536,9 @@ msgstr "Увімк" #: ckanext/issues/templates/issues/email/new_issue.html:2 msgid "a user has raised an issue with one of the datasets from organization" -msgstr "користувач почав обговорення скарги з одного з наборів даних розпорядника" +msgstr "" +"користувач почав обговорення пропозиції з одного з наборів даних " +"розпорядника" #: ckanext/issues/templates/issues/email/new_issue.html:4 msgid "The dataset is: " @@ -528,11 +546,15 @@ msgstr "Набір даних: " #: ckanext/issues/templates/issues/email/new_issue.html:6 msgid "The issue is:" -msgstr "Скарга: " +msgstr "Пропозиція: " #: ckanext/issues/templates/issues/email/new_issue.html:11 msgid "Please correct the problem or add an initial comment about the issue at: " -msgstr "Будь ласка, вирішіть проблему чи додайте перший коментар до скарги: " +msgstr "Будь ласка, вирішіть проблему чи додайте перший коментар до пропозиції: " + +#: ckanext/issues/templates/issues/email/new_issue.html:11 +msgid "Once the issue has been resolved, click 'Close issue'." +msgstr "Якщо пропозиція прийнята, то виберить 'Закрити'." #: ckanext/issues/templates/issues/email/new_issue.html:13 msgid "Thank you," @@ -548,7 +570,7 @@ msgstr "команда" #: ckanext/issues/templates/issues/email/new_issue.html:19 msgid "Issue:" -msgstr "Скарга:" +msgstr "Пропозиція:" #: ckanext/issues/templates/issues/email/new_issue.html:20 msgid "Dataset:" @@ -561,21 +583,28 @@ msgstr "Користувач:" #: ckanext/issues/templates/snippets/search_result_text.html:3 msgid "{number} issue found for \"{query}\"" msgid_plural "{number} issues found for \"{query}\"" -msgstr[0] "{number} скарга знайдена по \"{query}\\" -msgstr[1] "{number} скарги знайдено по \"{query}\\" -msgstr[2] "{number} скарг знайдено по \"{query}\\" +msgstr[0] "{number} пропозиція знайдена по \"{query}\\" +msgstr[1] "{number} пропозиції знайдено по \"{query}\\" +msgstr[2] "{number} пропозиції знайдено по \"{query}\\" #: ckanext/issues/templates/snippets/search_result_text.html:4 msgid "No issues found for \"{query}\"" -msgstr "Скарги на \"{query}\" не знайдені" +msgstr "Пропозиції на \"{query}\" не знайдені" #: ckanext/issues/templates/snippets/search_result_text.html:6 msgid "No issues found" -msgstr "Скарги не знайдені" +msgstr "Пропозиції не знайдені" + +# Don't delete +msgid "Open" +msgstr "Відкрита" + +msgid "Closed" +msgstr "Закрита" -#~ msgid "Start typing…" -#~ msgstr "Вводьте текст" +msgid "Visible" +msgstr "Відкриті" -#~ msgid "

    Issues are ... .

    " -#~ msgstr "

    Скарги – це ... .

    " +msgid "Hidden" +msgstr "Закриті" diff --git a/ckanext/issues/templates/issues/add.html b/ckanext/issues/templates/issues/add.html index bdee15ea..645d4779 100644 --- a/ckanext/issues/templates/issues/add.html +++ b/ckanext/issues/templates/issues/add.html @@ -15,8 +15,8 @@

    {{ _('The form contains invalid entries:') }}

      -set {% for key, error in c.error_summary.items() %} -
    • {{ key }}: {{ error[0] }}
      • + {% for key, error in c.error_summary.items() %} +
    • {{ _(key) }}: {{ _(error[0]) }}
      • {% endfor %}
    diff --git a/ckanext/issues/templates/issues/common.html b/ckanext/issues/templates/issues/common.html index 1dcb7103..0094ff74 100644 --- a/ckanext/issues/templates/issues/common.html +++ b/ckanext/issues/templates/issues/common.html @@ -9,9 +9,9 @@