From f02163c803fc2bc6c8cdfa86ad837908bf88cd96 Mon Sep 17 00:00:00 2001
From: chbaeh <chbaeh@gmail.com>
Date: Mon, 26 Nov 2018 15:11:38 +0100
Subject: [PATCH] ODPSH-150: change spatial_extension to spatial_uri
---
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 4369 -> 4351 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 6 +++---
ckanext/odsh/plugin.py | 4 ++--
.../odsh/templates/package/snippets/info.html | 4 ++--
.../snippets/package_basic_fields.html | 10 +++++-----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index b509ba3d4b09c1a93683eca8a69821800b0bf9ca..1573fc928e1c204bc7dda84da9635a1678f4a43e 100644
GIT binary patch
delta 1035
zcmbQJ^j~p8PrV=m14Ah*0|OTW14BD20|Pe$1H&X%1_o9J28Ma83=BdH3=B(H85r0Y
z7#Oy*GB9v5Ffi<6WnhqCU|=`_6@SRez`)MH!0-ZU&IhRe-%xo*HU<Vh1_lNWHU<V2
z1_lOkHU<U}1_lNjHimizSq27%KsE*jUIqq+d^QFKNd^XnTBwHUY!C-6V`E^DVqjp{
z#KyqD!oa|AmW_ddhk=3N5>(xNHU<V=1_p+AYzz#d3=9l1><|wau`@7mFfcG!utPlH
z$PRIc2UI+qy`F(VoPmKMft`VYpMim)f*oQ(2bA9nRXCR&5<<(M25f|?JHQTc;87_5
zB0B?vFara_HFk(YUa>QPJqU7zDgy(990vn~90LP`3kL&(0s{j>ay<tFgA4-$LkkDQ
z=L<O?LA;xTfq{vEf#E0z1A`tYs5uxIycif5zH=}zSTHa!IB_yCOkiYSsOE%(91l0d
zLMd(r215o01_N#e29SkG+z|N=Zb*ntgVKwk>gzXfL*nEZHv@wh0|Ucrs00%a!~h8%
zh>PubAO^+qKrG7UfdpkE4<zm<@Gvk4FfcI8;DH47N*+jvZQy~Vq1{maIjH<i2wl(c
zfCmy+&mjT~Z+Rez;|tVcPF_d|Y49>I$TKi7xbi}RJe3y`w1vD72lewpLT)K91A`_5
z1H*b=h=XtPLZak3RNZf01_mPr1_nVska_hC3@&^S2c+;p49Mbx_@D&JujYfKiB>)a
z1~mo-hAuvck2dl_e13!v;`1|5^>_Io7C+}>U;yQ=uY3#)%nS?+?EDaQ-24#pWkCEC
z1_lOYeg*~&1_lNben={g<%a})H$TLs8~Gto^n{;*L5qQbfl~nDV-o>L>h=<VSP(40
wz+lP1zz{CLz~Iclz%Wq&5)xN8XR=5!GM5%*Zth{#fH3y5J%BKlab$A<08)BlC;$Ke
delta 1053
zcmeybI8kXrPrWz;14Ah*0|OTW14Az>0|Pe$1H%kf1_o9J28Jc93=BdH3=FGS85r0Y
z7#Q}lGB9v5FfbfpWnhqCU|={06@Sjkz`)MH!0--g&NrxjMmC5(b~XkEJ_ZH`J~jph
z6$S<dSvCd+5e5bZCpLz923ZCMhHy3p240Xu*cccj85kIvp&I70F)#=+FfgoPV_=YC
zU|`tC#=yYBz`$^mje&uOfq~&3RNZSf1_oUQ28Lg33=E<S3=A6V5D(a~Gca&4Ffh2V
zLmcAE4sl2bR6Lozo`C@r0y*pq4EziX3@z*s3#LH%GocDsvO_{>6V!mcP<3b6At81V
z%D>Cbz#z=P!0?D2;*f9b3}6rPa4;~aGB7Y`aWF8*F)%O$a4;|^FfcIW*K;s1C^0ZF
zOyGd{d@~0mh|h8`FfcJNFkI(gV9;Y=V7SG>z~IHez`)7Lz+l0^z!1X8z%YT4fuWZZ
z5^{3f5DRs<85j&fLCX!Xu!I{TKZ_d@Vk@BZR;c>=L)?%!xxvlAAjZJJ@E0l}!UHit
ziwEjr9*9BtJP?a&c_2YKnFkX0i+C6q1VCwp2NKk~c_1NnhzF8}&O-SQpz^OFbUni-
z9!OmMga|PF=Yb>+HeQIu(!2}|G7Jn1R=f-h@}RWB3kmXaUP#b3^Fkc7kQWki+j$un
zG#MBe4)Q`A{F)aMB|o9+c=;F@j2IXgl=(pB)iW@J@j)C=#s@K=h7aO{HYmTB50WOP
z^D!`}F)%R9;e+_-FdxL{*Z3elzXw(So)2R2Pd-TEW#?yLU}j)okmQG`ljVn)uLt6%
zFfcHf@-r}KFfcH<@k3H^K0hSr=kh~bdYB&)Mc?=t7_=A|7^DRtK6Vp;r0y62hy|$v
z3=EbG3=Ek93=GZ;3=E3}AR+O5b0&)vBWG$wNornkW`5r0HdYN}?nbr;$lNI$*&F~o
C$7|vM
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 6f85414f..4d015035 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -79,7 +79,7 @@ msgstr "Beschreibung eingeben"
msgid "Enter tags"
msgstr "Stichwörter eingeben"
-msgid "Enter spatial extension"
+msgid "Enter spatial uri"
msgstr "Orte eingeben"
msgid "Enter data"
@@ -151,7 +151,7 @@ msgstr "Letzte Änderung"
msgid "Files"
msgstr "Dateien"
-msgid "Spatial extension"
+msgid "Spatial uri"
msgstr "Raumbezug"
msgid "Beginn des Zeitraumes: Fehlender Wert"
@@ -181,7 +181,7 @@ msgstr "Bitte geben Sie einen Titel ein"
msgid "odsh_publish_date_error_label"
msgstr "Bitte wählen Sie ein Veröffentlichungsdatum"
-msgid "odsh_spatial_extension_error_label"
+msgid "odsh_spatial_uri_error_label"
msgstr "Bitte geben sie einen räumlichen Bezug an"
msgid "Tag string: Fehlender Wert"
diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py
index 1a525e57..efb455d9 100644
--- a/ckanext/odsh/plugin.py
+++ b/ckanext/odsh/plugin.py
@@ -165,8 +165,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
return ['title','notes']
def _extraFields(self):
- ##return ['publish_date','access_constraints','temporal_start','temporal_end','spatial_extension']
- return ['publish_date','temporal_start','temporal_end','spatial_extension']
+ ##return ['publish_date','access_constraints','temporal_start','temporal_end','spatial_uri']
+ return ['publish_date','temporal_start','temporal_end','spatial_uri']
def _update_schema(self,schema):
for field in self._extraFields():
diff --git a/ckanext/odsh/templates/package/snippets/info.html b/ckanext/odsh/templates/package/snippets/info.html
index ea9bc185..46fadc1c 100644
--- a/ckanext/odsh/templates/package/snippets/info.html
+++ b/ckanext/odsh/templates/package/snippets/info.html
@@ -35,8 +35,8 @@ Example:
{% block spatial %}
<div class="spatial-detail info-detail">
- <div>{{ _('Spatial extension') }}:</div>
- {%set ext=pkg.spatial_extension if pkg.spatial_extension else '-'%}
+ <div>{{ _('Spatial uri') }}:</div>
+ {%set ext=pkg.spatial_uri if pkg.spatial_uri else '-'%}
<p>{{ ext }}</p>
</div>
{% endblock %}
diff --git a/ckanext/odsh/templates/package/snippets/package_basic_fields.html b/ckanext/odsh/templates/package/snippets/package_basic_fields.html
index e38d04ea..c22327c6 100644
--- a/ckanext/odsh/templates/package/snippets/package_basic_fields.html
+++ b/ckanext/odsh/templates/package/snippets/package_basic_fields.html
@@ -155,12 +155,12 @@ is_required=true,placeholder=_('Enter title')) }}
</div>
{% endblock %}
- <!-- field spatial_extension -->
- {% set error_string = _('odsh_spatial_extension_error_label') if errors.spatial_extension %}
- {{ form.input('spatial_extension', id='field-spatial-extension', label=_('Spatial extension'),
- value=data.spatial_extension,
+ <!-- field spatial_uri -->
+ {% set error_string = _('odsh_spatial_uri_error_label') if errors.spatial_uri %}
+ {{ form.input('spatial_uri', id='field-spatial-uri', label=_('Spatial uri'),
+ value=data.spatial_uri,
error=error_string, classes=['control-full'],type='text',is_required=true,
- placeholder=_('Enter spatial extension')) }}
+ placeholder=_('Enter spatial uri')) }}
<!-- field private -->
<div class="control-group">
--
GitLab