Goobi.Presentation

Merge lp:~sebastian-meyer/goobi-presentation/bug-984775 into lp:goobi-presentation/1.1

  1. bug-984775
  2. Merge into 1.1
Proposed by Sebastian Meyer
Status: Merged
Merged at revision: 83
Proposed branch: lp:~sebastian-meyer/goobi-presentation/bug-984775
Merge into: lp:goobi-presentation/1.1
Diff against target: 350 lines (+65/-34)
7 files modified
dlf/lib/ISO-639/iso-639-1.xml (+21/-20)
dlf/lib/ISO-639/iso-639-2b.xml (+11/-8)
dlf/modules/newclient/locallang.xml (+2/-0)
dlf/modules/newclient/metadata.inc.php (+15/-1)
dlf/plugins/collection/class.tx_dlf_collection.php (+1/-1)
dlf/plugins/listview/class.tx_dlf_listview.php (+1/-1)
dlf/plugins/search/class.tx_dlf_search.php (+14/-3)
To merge this branch: bzr merge lp:~sebastian-meyer/goobi-presentation/bug-984775
Reviewer Review Type Date Requested Status
Sebastian Meyer Approve
Review via email: mp+105767@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastian Meyer (sebastian-meyer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dlf/lib/ISO-639/iso-639-1.xml'
2--- dlf/lib/ISO-639/iso-639-1.xml 2012-03-20 14:11:28 +0000
3+++ dlf/lib/ISO-639/iso-639-1.xml 2012-05-15 07:32:27 +0000
4@@ -19,7 +19,7 @@
5 <label index="bg">Bulgarian</label>
6 <label index="bh">Bihari</label>
7 <label index="bi">Bislama</label>
8- <label index="bn">Bengali, Bangla</label>
9+ <label index="bn">Bengali</label>
10 <label index="bo">Tibetan</label>
11 <label index="br">Breton</label>
12 <label index="ca">Catalan</label>
13@@ -28,7 +28,7 @@
14 <label index="cy">Welsh</label>
15 <label index="da">Danish</label>
16 <label index="de">German</label>
17- <label index="dz">Bhutani</label>
18+ <label index="dz">Dzongkha</label>
19 <label index="el">Greek</label>
20 <label index="en">English</label>
21 <label index="eo">Esperanto</label>
22@@ -37,12 +37,12 @@
23 <label index="eu">Basque</label>
24 <label index="fa">Persian</label>
25 <label index="fi">Finnish</label>
26- <label index="fj">Fiji</label>
27+ <label index="fj">Fijian</label>
28 <label index="fo">Faroese</label>
29 <label index="fr">French</label>
30 <label index="fy">Frisian</label>
31 <label index="ga">Irish</label>
32- <label index="gd">Scots Gaelic</label>
33+ <label index="gd">Scottish Gaelic</label>
34 <label index="gl">Galician</label>
35 <label index="gn">Guarani</label>
36 <label index="gu">Gujarati</label>
37@@ -54,7 +54,7 @@
38 <label index="hy">Armenian</label>
39 <label index="ia">Interlingua</label>
40 <label index="id">Indonesian</label>
41- <label index="ie">Interlingue</label>
42+ <label index="ie">Interlingue, Occidental</label>
43 <label index="ik">Inupiak</label>
44 <label index="is">Icelandic</label>
45 <label index="it">Italian</label>
46@@ -62,21 +62,22 @@
47 <label index="iw">Hebrew</label>
48 <label index="ja">Japanese</label>
49 <label index="ji">Yiddish</label>
50+ <label index="jv">Javanese</label>
51 <label index="jw">Javanese</label>
52 <label index="ka">Georgian</label>
53 <label index="kk">Kazakh</label>
54- <label index="kl">Greenlandic</label>
55- <label index="km">Cambodian</label>
56+ <label index="kl">Kalaallisut, Greenlandic</label>
57+ <label index="km">Khmer</label>
58 <label index="kn">Kannada</label>
59 <label index="ko">Korean</label>
60 <label index="ks">Kashmiri</label>
61 <label index="ku">Kurdish</label>
62- <label index="ky">Kirghiz</label>
63+ <label index="ky">Kirghiz, Kyrgyz</label>
64 <label index="la">Latin</label>
65 <label index="ln">Lingala</label>
66- <label index="lo">Laothian</label>
67+ <label index="lo">Lao</label>
68 <label index="lt">Lithuanian</label>
69- <label index="lv">Latvian, Lettish</label>
70+ <label index="lv">Latvian</label>
71 <label index="mg">Malagasy</label>
72 <label index="mi">Maori</label>
73 <label index="mk">Macedonian</label>
74@@ -92,21 +93,21 @@
75 <label index="nl">Dutch</label>
76 <label index="no">Norwegian</label>
77 <label index="oc">Occitan</label>
78- <label index="om">(Afan) Oromo</label>
79+ <label index="om">Oromo</label>
80 <label index="or">Oriya</label>
81- <label index="pa">Punjabi</label>
82+ <label index="pa">Panjabi</label>
83 <label index="pl">Polish</label>
84- <label index="ps">Pashto, Pushto</label>
85+ <label index="ps">Pushto</label>
86 <label index="pt">Portuguese</label>
87 <label index="qu">Quechua</label>
88- <label index="rm">Rhaeto-Romance</label>
89- <label index="rn">Kirundi</label>
90+ <label index="rm">Romansh</label>
91+ <label index="rn">Rundi</label>
92 <label index="ro">Romanian</label>
93 <label index="ru">Russian</label>
94 <label index="rw">Kinyarwanda</label>
95 <label index="sa">Sanskrit</label>
96 <label index="sd">Sindhi</label>
97- <label index="sg">Sangho</label>
98+ <label index="sg">Sango</label>
99 <label index="sh">Serbo-Croatian</label>
100 <label index="si">Sinhalese</label>
101 <label index="sk">Slovak</label>
102@@ -116,8 +117,8 @@
103 <label index="so">Somali</label>
104 <label index="sq">Albanian</label>
105 <label index="sr">Serbian</label>
106- <label index="ss">Siswati</label>
107- <label index="st">Sesotho</label>
108+ <label index="ss">Swati</label>
109+ <label index="st">Southern Sotho</label>
110 <label index="su">Sundanese</label>
111 <label index="sv">Swedish</label>
112 <label index="sw">Swahili</label>
113@@ -128,7 +129,7 @@
114 <label index="ti">Tigrinya</label>
115 <label index="tk">Turkmen</label>
116 <label index="tl">Tagalog</label>
117- <label index="tn">Setswana</label>
118+ <label index="tn">Tswana</label>
119 <label index="to">Tonga</label>
120 <label index="tr">Turkish</label>
121 <label index="ts">Tsonga</label>
122@@ -139,7 +140,7 @@
123 <label index="ur">Urdu</label>
124 <label index="uz">Uzbek</label>
125 <label index="vi">Vietnamese</label>
126- <label index="vo">Volapuk</label>
127+ <label index="vo">Volapük</label>
128 <label index="wo">Wolof</label>
129 <label index="xh">Xhosa</label>
130 <label index="yi">Yiddish</label>
131
132=== modified file 'dlf/lib/ISO-639/iso-639-2b.xml'
133--- dlf/lib/ISO-639/iso-639-2b.xml 2012-03-20 14:11:28 +0000
134+++ dlf/lib/ISO-639/iso-639-2b.xml 2012-05-15 07:32:27 +0000
135@@ -53,7 +53,7 @@
136 <label index="bas">Basa</label>
137 <label index="bat">Baltic languages</label>
138 <label index="bej">Beja, Bedawiyet</label>
139- <label index="bel">Belarusian</label>
140+ <label index="bel">Byelorussian</label>
141 <label index="bem">Bemba</label>
142 <label index="ben">Bengali</label>
143 <label index="ber">Berber languages</label>
144@@ -121,7 +121,7 @@
145 <label index="dsb">Lower Sorbian</label>
146 <label index="dua">Duala</label>
147 <label index="dum">Middle Dutch (ca.1050-1350)</label>
148- <label index="dut">Dutch, Flemish</label>
149+ <label index="dut">Dutch</label>
150 <label index="dyu">Dyula</label>
151 <label index="dzo">Dzongkha</label>
152 <label index="efi">Efik</label>
153@@ -204,11 +204,12 @@
154 <label index="ind">Indonesian</label>
155 <label index="ine">Indo-European languages</label>
156 <label index="inh">Ingush</label>
157- <label index="ipk">Inupiaq</label>
158+ <label index="ipk">Inupiak</label>
159 <label index="ira">Iranian languages</label>
160 <label index="iro">Iroquoian languages</label>
161 <label index="ita">Italian</label>
162 <label index="jav">Javanese</label>
163+ <label index="jaw">Javanese</label>
164 <label index="jbo">Lojban</label>
165 <label index="jpn">Japanese</label>
166 <label index="jpr">Judeo-Persian</label>
167@@ -227,7 +228,7 @@
168 <label index="kbd">Kabardian</label>
169 <label index="kha">Khasi</label>
170 <label index="khi">Khoisan languages</label>
171- <label index="khm">Central Khmer</label>
172+ <label index="khm">Khmer</label>
173 <label index="kho">Khotanese, Sakan</label>
174 <label index="kik">Kikuyu, Gikuyu</label>
175 <label index="kin">Kinyarwanda</label>
176@@ -294,6 +295,7 @@
177 <label index="mni">Manipuri</label>
178 <label index="mno">Manobo languages</label>
179 <label index="moh">Mohawk</label>
180+ <label index="mol">Moldavian</label>
181 <label index="mon">Mongolian</label>
182 <label index="mos">Mossi</label>
183 <label index="mul">Multiple languages</label>
184@@ -356,7 +358,7 @@
185 <label index="por">Portuguese</label>
186 <label index="pra">Prakrit languages</label>
187 <label index="pro">Old Provençal (to 1500)</label>
188- <label index="pus">Pushto, Pashto</label>
189+ <label index="pus">Pushto</label>
190 <label index="que">Quechua</label>
191 <label index="raj">Rajasthani</label>
192 <label index="rap">Rapanui</label>
193@@ -364,7 +366,7 @@
194 <label index="roa">Romance languages</label>
195 <label index="roh">Romansh</label>
196 <label index="rom">Romany</label>
197- <label index="rum">Romanian, Moldavian, Moldovan</label>
198+ <label index="rum">Romanian, Moldavian</label>
199 <label index="run">Rundi</label>
200 <label index="rup">Aromanian, Arumanian, Macedo-Romanian</label>
201 <label index="rus">Russian</label>
202@@ -385,7 +387,7 @@
203 <label index="sgn">Sign Languages</label>
204 <label index="shn">Shan</label>
205 <label index="sid">Sidamo</label>
206- <label index="sin">Sinhala, Sinhalese</label>
207+ <label index="sin">Sinhalese</label>
208 <label index="sio">Siouan languages</label>
209 <label index="sit">Sino-Tibetan languages</label>
210 <label index="sla">Slavic languages</label>
211@@ -484,7 +486,7 @@
212 <label index="zap">Zapotec</label>
213 <label index="zbl">Blissymbolics</label>
214 <label index="zen">Zenaga</label>
215- <label index="zha">Zhuang, Chuang</label>
216+ <label index="zha">Zhuang</label>
217 <label index="znd">Zande languages</label>
218 <label index="zul">Zulu</label>
219 <label index="zun">Zuni</label>
220@@ -780,6 +782,7 @@
221 <label index="mni">Meithei-Sprache</label>
222 <label index="mno">Manobo-Sprachen</label>
223 <label index="moh">Mohawk-Sprache</label>
224+ <label index="mol">Moldavisch</label>
225 <label index="mon">Mongolisch</label>
226 <label index="mos">Mossi-Sprache</label>
227 <label index="mul">Mehrere Sprachen</label>
228
229=== modified file 'dlf/modules/newclient/locallang.xml'
230--- dlf/modules/newclient/locallang.xml 2012-04-30 16:05:21 +0000
231+++ dlf/modules/newclient/locallang.xml 2012-05-15 07:32:27 +0000
232@@ -104,6 +104,7 @@
233 <label index="volume">Volume</label>
234 <label index="collection">Collection(s)</label>
235 <label index="owner">Owner</label>
236+ <label index="language">Language</label>
237 </languageKey>
238 <languageKey index="de" type="array">
239 <label index="title">Neuer Mandant</label>
240@@ -204,6 +205,7 @@
241 <label index="volume">Band</label>
242 <label index="collection">Sammlung(en)</label>
243 <label index="owner">Besitzer</label>
244+ <label index="language">Sprache</label>
245 </languageKey>
246 </data>
247 </T3locallang>
248\ No newline at end of file
249
250=== modified file 'dlf/modules/newclient/metadata.inc.php'
251--- dlf/modules/newclient/metadata.inc.php 2012-04-30 16:05:21 +0000
252+++ dlf/modules/newclient/metadata.inc.php 2012-05-15 07:32:27 +0000
253@@ -138,6 +138,20 @@
254 'is_facet' => 1,
255 'is_listed' => 0,
256 ),
257+ 'language' => array (
258+ 'encoded' => 1,
259+ 'xpath' => './mods:language/mods:languageTerm',
260+ 'xpath_sorting' => '',
261+ 'default_value' => '',
262+ 'wrap' => '',
263+ 'tokenized' => 0,
264+ 'stored' => 0,
265+ 'indexed' => 1,
266+ 'boost' => 1.00,
267+ 'is_sortable' => 0,
268+ 'is_facet' => 1,
269+ 'is_listed' => 0,
270+ ),
271 'year' => array (
272 'encoded' => 1,
273 'xpath' => '',
274@@ -221,7 +235,7 @@
275 'is_sortable' => 1,
276 'is_facet' => 1,
277 'is_listed' => 1,
278- ),
279+ )
280 );
281
282 ?>
283\ No newline at end of file
284
285=== modified file 'dlf/plugins/collection/class.tx_dlf_collection.php'
286--- dlf/plugins/collection/class.tx_dlf_collection.php 2012-05-07 09:52:15 +0000
287+++ dlf/plugins/collection/class.tx_dlf_collection.php 2012-05-15 07:32:27 +0000
288@@ -274,7 +274,7 @@
289 if (empty($_metadata)) {
290
291 $_metadata = array (
292- 'label' => $resArray['collLabel'],
293+ 'label' => htmlspecialchars($resArray['collLabel']),
294 'description' => $this->pi_RTEcssText($resArray['collDesc']),
295 'options' => array (
296 'source' => 'collection',
297
298=== modified file 'dlf/plugins/listview/class.tx_dlf_listview.php'
299--- dlf/plugins/listview/class.tx_dlf_listview.php 2012-05-05 16:30:51 +0000
300+++ dlf/plugins/listview/class.tx_dlf_listview.php 2012-05-15 07:32:27 +0000
301@@ -440,7 +440,7 @@
302
303 }
304
305- $markerArray['###LISTTITLE###'] = htmlspecialchars($this->list->metadata['label']);
306+ $markerArray['###LISTTITLE###'] = $this->list->metadata['label'];
307
308 $markerArray['###LISTDESCRIPTION###'] = $this->list->metadata['description'];
309
310
311=== modified file 'dlf/plugins/search/class.tx_dlf_search.php'
312--- dlf/plugins/search/class.tx_dlf_search.php 2012-03-30 09:14:14 +0000
313+++ dlf/plugins/search/class.tx_dlf_search.php 2012-05-15 07:32:27 +0000
314@@ -78,13 +78,24 @@
315
316 }
317
318+ // Set last query if applicable.
319+ $lastQuery = '';
320+
321+ $_list = t3lib_div::makeInstance('tx_dlf_list');
322+
323+ if (!empty($_list->metadata['options']['source']) && $_list->metadata['options']['source'] == 'search') {
324+
325+ $lastQuery = $_list->metadata['options']['select'];
326+
327+ }
328+
329 // Fill markers.
330 $markerArray = array (
331 '###ACTION_URL###' => $this->pi_getPageLink($GLOBALS['TSFE']->id),
332 '###LABEL_QUERY###' => $this->pi_getLL('label.query'),
333 '###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
334 '###FIELD_QUERY###' => $this->prefixId.'[query]',
335- '###QUERY###' => '',
336+ '###QUERY###' => htmlspecialchars($lastQuery),
337 );
338
339 // Display search form.
340@@ -103,8 +114,8 @@
341
342 // Set metadata for search.
343 $_metadata = array (
344- 'label' => sprintf($this->pi_getLL('searchfor', ''), $this->piVars['query']),
345- 'description' => sprintf($this->pi_getLL('hits', ''), $numHits),
346+ 'label' => htmlspecialchars(sprintf($this->pi_getLL('searchfor', ''), $this->piVars['query'])),
347+ 'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $numHits)).'</p>',
348 'options' => array (
349 'source' => 'search',
350 'select' => $this->piVars['query'],

Subscribers

People subscribed via source and target branches

to all changes: