Skip to content

Commit 335d07f

Browse files
committed
Prepare release 2.2.0
1 parent 25e981e commit 335d07f

File tree

8 files changed

+46
-87
lines changed

8 files changed

+46
-87
lines changed

CHANGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Changelog
22
=========
33

44

5-
2.2.0 (unreleased)
5+
2.2.0 (2022-06-10)
66
------------------
77

88
- #34 Fix non-lab users can access to storage

buildout.cfg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ auto-checkout = *
3131
develop = .
3232

3333
[sources]
34-
senaite.core = git git://github.com/senaite/senaite.core.git pushurl=git@github.com:senaite/senaite.core.git branch=2.x
35-
senaite.app.listing = git git://github.com/senaite/senaite.app.listing.git pushurl=git@github.com:senaite/senaite.app.listing.git branch=2.x
36-
senaite.app.spotlight = git git://github.com/senaite/senaite.app.spotlight.git pushurl=git@github.com:senaite/senaite.app.spotlight.git branch=2.x
37-
senaite.app.supermodel = git git://github.com/senaite/senaite.app.supermodel.git pushurl=git@github.com:senaite/senaite.app.supermodel.git branch=2.x
38-
senaite.impress = git git://github.com/senaite/senaite.impress.git pushurl=git@github.com:senaite/senaite.impress.git branch=2.x
39-
senaite.jsonapi = git git://github.com/senaite/senaite.jsonapi.git pushurl=git@github.com:senaite/senaite.jsonapi.git branch=2.x
40-
senaite.lims = git git://github.com/senaite/senaite.lims.git pushurl=git@github.com:senaite/senaite.lims.git branch=2.x
34+
senaite.core = git https://github.com/senaite/senaite.core.git pushurl=git@github.com:senaite/senaite.core.git branch=2.x
35+
senaite.app.listing = git https://github.com/senaite/senaite.app.listing.git pushurl=git@github.com:senaite/senaite.app.listing.git branch=2.x
36+
senaite.app.spotlight = git https://github.com/senaite/senaite.app.spotlight.git pushurl=git@github.com:senaite/senaite.app.spotlight.git branch=2.x
37+
senaite.app.supermodel = git https://github.com/senaite/senaite.app.supermodel.git pushurl=git@github.com:senaite/senaite.app.supermodel.git branch=2.x
38+
senaite.impress = git https://github.com/senaite/senaite.impress.git pushurl=git@github.com:senaite/senaite.impress.git branch=2.x
39+
senaite.jsonapi = git https://github.com/senaite/senaite.jsonapi.git pushurl=git@github.com:senaite/senaite.jsonapi.git branch=2.x
40+
senaite.lims = git https://github.com/senaite/senaite.lims.git pushurl=git@github.com:senaite/senaite.lims.git branch=2.x
4141

4242
[instance]
4343
recipe = plone.recipe.zope2instance
@@ -79,4 +79,4 @@ eggs = ${buildout:eggs}
7979

8080
[versions]
8181
setuptools = 42.0.2
82-
zc.buildout = 2.13.3
82+
zc.buildout = 2.13.3

src/senaite/storage/locales/cs/LC_MESSAGES/senaite.storage.po

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# SOME DESCRIPTIVE TITLE.
33
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
44
# Translators:
5-
# trendspotter <jirka.p@volny.cz>, 2020
5+
# trendspotter <jirka.p@volny.cz>, 2022
66
#
77
msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
10-
"POT-Creation-Date: 2022-01-08 09:56+0000\n"
10+
"POT-Creation-Date: 2022-06-10 21:46+0000\n"
1111
"PO-Revision-Date: 2019-03-31 21:21+0000\n"
12-
"Last-Translator: trendspotter <jirka.p@volny.cz>, 2020\n"
12+
"Last-Translator: trendspotter <jirka.p@volny.cz>, 2022\n"
1313
"Language-Team: Czech (https://www.transifex.com/senaite/teams/97702/cs/)\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,9 +38,10 @@ msgstr "&larr; Zpět"
3838

3939
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
4040
msgid "Activate"
41-
msgstr ""
41+
msgstr "Aktivovat"
4242

4343
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
44+
#: senaite/storage/profiles/default/workflows/senaite_storage_folder_workflow/definition.xml
4445
msgid "Active"
4546
msgstr "Aktivní"
4647

@@ -71,7 +72,7 @@ msgstr "Přidat kontejner vzorků"
7172

7273
#: senaite/storage/browser/facility/view.py:57
7374
msgid "Add storage position"
74-
msgstr ""
75+
msgstr "Přidat pozici úložiště"
7576

7677
#: senaite/storage/content/storagefacility.py:55
7778
msgid "Address"
@@ -93,33 +94,33 @@ msgstr "Nelze ukládat vzorky. Kontejner na vzorky {} je plný"
9394

9495
#: senaite/storage/browser/container/templates/move_container.pt:63
9596
msgid "Choose container destination..."
96-
msgstr ""
97+
msgstr "Vyberte cíl kontejneru..."
9798

9899
#: senaite/storage/browser/container/view.py:70
99100
#: senaite/storage/browser/facility/view.py:88
100101
#: senaite/storage/browser/position/view.py:52
101102
msgid "Collapsed"
102-
msgstr ""
103+
msgstr "Sbaleno"
103104

104105
#: senaite/storage/content/storagelayoutcontainer.py:62
105106
msgid "Columns"
106107
msgstr "Sloupce"
107108

108109
#: senaite/storage/browser/container/samples.py:117
109110
msgid "Container is full"
110-
msgstr ""
111+
msgstr "Kontejner je plný"
111112

112113
#: senaite/storage/browser/container/move_container.py:68
113114
msgid "Container moving cancelled"
114-
msgstr ""
115+
msgstr "Přesun kontejneru zrušen"
115116

116117
#: senaite/storage/browser/container/samples.py:123
117118
msgid "Container utilization {} / {}"
118-
msgstr ""
119+
msgstr "Využití kontejneru {} / {}"
119120

120121
#: senaite/storage/browser/container/move_container.py:98
121122
msgid "Container {} is already located in destination path!"
122-
msgstr ""
123+
msgstr "Kontejner {} se již nachází na cílové cestě!"
123124

124125
#: senaite/storage/browser/storage/listing.py:64
125126
msgid "Containers"
@@ -131,16 +132,16 @@ msgstr "Datum uloženo"
131132

132133
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
133134
msgid "Deactivate"
134-
msgstr ""
135+
msgstr "Deaktivovat"
135136

136137
#: senaite/storage/browser/facility/view.py:80
137138
#: senaite/storage/browser/storage/view.py:70
138139
msgid "Description"
139-
msgstr ""
140+
msgstr "Popis"
140141

141142
#: senaite/storage/content/storage_position.py:40
142143
msgid "Description of the storage position that is shown in listings"
143-
msgstr ""
144+
msgstr "Popis skladové pozice, která se zobrazuje ve výpisech"
144145

145146
#: senaite/storage/content/storagefacility.py:47
146147
msgid "Email Address"
@@ -150,7 +151,7 @@ msgstr "e-mailová adresa"
150151
#: senaite/storage/browser/facility/view.py:94
151152
#: senaite/storage/browser/position/view.py:58
152153
msgid "Expanded"
153-
msgstr ""
154+
msgstr "Rozbaleno"
154155

155156
#: senaite/storage/content/storagecontainer.py:38
156157
msgid "Expected temperature"
@@ -162,7 +163,7 @@ msgstr "Očekávaná teplota tohoto kontejneru"
162163

163164
#: senaite/storage/content/storagecontainer.py:61
164165
msgid "Expected temperature: %s °C"
165-
msgstr ""
166+
msgstr "Očekávaná teplota: %s °C"
166167

167168
#: senaite/storage/browser/facility/view.py:74
168169
#: senaite/storage/browser/storage/listing.py:58
@@ -173,31 +174,31 @@ msgstr "ID"
173174
#: senaite/storage/browser/facility/view.py:106
174175
#: senaite/storage/browser/position/view.py:70
175176
msgid "Inactive"
176-
msgstr ""
177+
msgstr "Neaktivní"
177178

178179
#: senaite/storage/content/storagelayoutcontainer.py:135
179180
msgid "Layout: {} x {}"
180-
msgstr ""
181+
msgstr "Rozložení: {} x {}"
181182

182183
#: senaite/storage/browser/viewlets/templates/sample_container_viewlet.pt:19
183184
msgid "Location:"
184185
msgstr "Umístění:"
185186

186187
#: senaite/storage/content/storagefacility.py:92
187188
msgid "Mail: {}"
188-
msgstr ""
189+
msgstr "E-mail: {}"
189190

190191
#: senaite/storage/browser/container/templates/move_container.pt:15
191192
msgid "Move Containers"
192-
msgstr ""
193+
msgstr "Přesunout kontejnery"
193194

194195
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
195196
msgid "Move container"
196-
msgstr ""
197+
msgstr "Přesunout kontejner"
197198

198199
#: senaite/storage/browser/container/move_container.py:105
199200
msgid "Moved container {} → {}"
200-
msgstr ""
201+
msgstr "Přesunutý kontejner {} → {}"
201202

202203
#: senaite/storage/browser/facility/view.py:71
203204
#: senaite/storage/browser/storage/listing.py:55
@@ -250,7 +251,7 @@ msgstr "Vzorek"
250251

251252
#: senaite/storage/browser/storage/view.py:67
252253
msgid "Sample Containers"
253-
msgstr ""
254+
msgstr "Kontejnery na vzorky"
254255

255256
#: senaite/storage/browser/container/store_container.py:207
256257
msgid "Sample storing canceled"
@@ -281,7 +282,7 @@ msgstr "Použití vzorků"
281282

282283
#: senaite/storage/browser/container/templates/store_container.pt:196
283284
msgid "Status"
284-
msgstr ""
285+
msgstr "Stav"
285286

286287
#: senaite/storage/adapters/listing.py:111
287288
msgid "Storage"
@@ -293,7 +294,7 @@ msgstr "Zařízení úložiště"
293294

294295
#: senaite/storage/profiles/default/types/StoragePosition.xml
295296
msgid "Storage Position"
296-
msgstr ""
297+
msgstr "Pozice úložiště"
297298

298299
#: senaite/storage/profiles/default/types/StorageContainer.xml
299300
msgid "Storage container"
@@ -321,16 +322,16 @@ msgstr "Uložený vzorek {} na pozici {}"
321322

322323
#: senaite/storage/content/storagefacility.py:89
323324
msgid "Tel: {}"
324-
msgstr ""
325+
msgstr "Tel: {}"
325326

326327
#: senaite/storage/content/storage_position.py:34
327328
msgid "The name of the storage position, e.g. Room 12/3"
328-
msgstr ""
329+
msgstr "Název skladovací pozice, např. místnost 12/3."
329330

330331
#: senaite/storage/profiles/default/types/StoragePosition.xml
331332
msgid "The storage position inside a facility"
332-
msgstr ""
333+
msgstr "Skladovací pozice uvnitř zařízení"
333334

334335
#: senaite/storage/browser/container/templates/store_container.pt:32
335336
msgid "Used positions:"
336-
msgstr ""
337+
msgstr "Použité pozice:"

src/senaite/storage/locales/de/LC_MESSAGES/senaite.storage.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
msgid ""
99
msgstr ""
1010
"Project-Id-Version: PACKAGE VERSION\n"
11-
"POT-Creation-Date: 2022-01-08 09:56+0000\n"
11+
"POT-Creation-Date: 2022-06-10 21:46+0000\n"
1212
"PO-Revision-Date: 2019-03-31 21:21+0000\n"
1313
"Last-Translator: Ramon Bartl <rb@ridingbytes.com>, 2022\n"
1414
"Language-Team: German (https://www.transifex.com/senaite/teams/97702/de/)\n"
@@ -42,6 +42,7 @@ msgid "Activate"
4242
msgstr "Aktivieren"
4343

4444
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
45+
#: senaite/storage/profiles/default/workflows/senaite_storage_folder_workflow/definition.xml
4546
msgid "Active"
4647
msgstr "Aktiv"
4748

src/senaite/storage/locales/en/LC_MESSAGES/senaite.storage.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
4-
"POT-Creation-Date: 2022-01-08 09:56+0000\n"
4+
"POT-Creation-Date: 2022-06-10 21:46+0000\n"
55
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
66
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
77
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,7 @@ msgid "Activate"
3434
msgstr ""
3535

3636
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
37+
#: senaite/storage/profiles/default/workflows/senaite_storage_folder_workflow/definition.xml
3738
msgid "Active"
3839
msgstr ""
3940

src/senaite/storage/locales/es/LC_MESSAGES/senaite.storage.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
msgid ""
99
msgstr ""
1010
"Project-Id-Version: PACKAGE VERSION\n"
11-
"POT-Creation-Date: 2022-01-08 09:56+0000\n"
11+
"POT-Creation-Date: 2022-06-10 21:46+0000\n"
1212
"PO-Revision-Date: 2019-03-31 21:21+0000\n"
1313
"Last-Translator: Pau Soliva <psoliva@naralabs.com>, 2019\n"
1414
"Language-Team: Spanish (https://www.transifex.com/senaite/teams/97702/es/)\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18+
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
1919
"Language-Code: en\n"
2020
"Language-Name: English\n"
2121
"Preferred-Encodings: utf-8 latin1\n"
@@ -42,6 +42,7 @@ msgid "Activate"
4242
msgstr ""
4343

4444
#: senaite/storage/profiles/default/workflows/senaite_storage_default_workflow/definition.xml
45+
#: senaite/storage/profiles/default/workflows/senaite_storage_folder_workflow/definition.xml
4546
msgid "Active"
4647
msgstr "Activo"
4748

src/senaite/storage/tests/base.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class SimpleTestLayer(PloneSandboxLayer):
3737
def setUpZope(self, app, configurationContext):
3838
super(SimpleTestLayer, self).setUpZope(app, configurationContext)
3939

40-
import Products.TextIndexNG3
4140
import bika.lims
4241
import senaite.core
4342
import senaite.app.listing
@@ -46,7 +45,6 @@ def setUpZope(self, app, configurationContext):
4645
import senaite.storage
4746

4847
# Load ZCML
49-
self.loadZCML(package=Products.TextIndexNG3)
5048
self.loadZCML(package=bika.lims)
5149
self.loadZCML(package=senaite.core)
5250
self.loadZCML(package=senaite.app.listing)
@@ -55,7 +53,6 @@ def setUpZope(self, app, configurationContext):
5553
self.loadZCML(package=senaite.storage)
5654

5755
# Install product and call its initialize() function
58-
zope.installProduct(app, "Products.TextIndexNG3")
5956
zope.installProduct(app, "bika.lims")
6057
zope.installProduct(app, "senaite.core")
6158
zope.installProduct(app, "senaite.app.listing")

src/senaite/storage/tests/test_setup.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)