Skip to content

Commit 744aafb

Browse files
committed
fix: update docker demo config [PXWEB2-968]
1 parent 3699aac commit 744aafb

File tree

11 files changed

+110
-74
lines changed

11 files changed

+110
-74
lines changed

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Docker - PxWebApi and PxWeb 2.0
22

3-
https://github.com/PxTools/PxWeb2/tree/main/docs/documentation/docker.md
3+
<https://github.com/PxTools/pxtools.github.io/blob/main/docs/PxWeb2/documentation/docker.md>
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
window.PxWeb2Config = {
22
language: {
3-
supportedLanguages: [
4-
{ shorthand: 'en', languageName: 'English' },
5-
],
3+
supportedLanguages: [{ shorthand: 'en', languageName: 'English' }],
64
defaultLanguage: 'en',
75
fallbackLanguage: 'en',
86
showDefaultLanguageInPath: true,
97
},
108
baseApplicationPath: '/',
119
apiUrl: '//localhost:8081/api/v2',
1210
maxDataCells: 150000,
11+
showBreadCrumbOnStartPage: false,
1312
specialCharacters: ['.', '..', ':', '-', '...', '*'],
1413
variableFilterExclusionList: {
1514
en: [
@@ -21,4 +20,9 @@ window.PxWeb2Config = {
2120
'every fifth year',
2221
]
2322
},
24-
};
23+
homePage: {
24+
no: '', // Set to your Norwegian homepage URL
25+
sv: '', // Set to your Swedish homepage URL
26+
en: '', // Set to your English homepage URL
27+
},
28+
};

docker/pxweb2/public/content/ar/content.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
{
22
"startPage": {
3-
"breadCrumb": {
4-
"enabled": true,
5-
"text": "الصفحة الرئيسية",
6-
"href": "#"
7-
},
83
"detailsSection": {
94
"enabled": true,
105
"detailHeader": "المزيد عن PxWeb",
116
"detailContent": [
127
{
138
"textBlock": {
149
"header": "متى يُستخدم هذا القسم",
15-
"text": "هذا قسم اختياري يمكن استخدامه لمحتوى قد يكون مفيداً لبعض المستخدمين، لكنه ليس ضرورياً للجميع. ينبغي أن تظهر المعلومات الأساسية التي يحتاج جميع المستخدمين إلى الاطلاع عليها دائماً في الفقرة الافتتاحية."
10+
"text": "هذا قسم اختياري يمكن استخدامه لمحتوى قد يكون مفيداً لبعض المستخدمين، لكنه ليس ضرورياً للجميع. ينبغي أن تظهر المعلومات الأساسية التي يحتاج جميع المستخدمين إلى الاطلاع عليها دائماً في الفقرة الافتتاحية."
1611
}
1712
},
1813
{

docker/pxweb2/public/content/en/content.json

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
{
22
"startPage": {
3-
"breadCrumb": {
4-
"enabled": false,
5-
"items": [
6-
{
7-
"label": "Home",
8-
"href": "#"
9-
},
10-
{
11-
"label": "PxWeb",
12-
"href": "/"
13-
}
14-
]
15-
},
163
"detailsSection": {
174
"enabled": true,
185
"detailHeader": "More about PxWeb",
@@ -43,6 +30,14 @@
4330
}
4431
}
4532
]
33+
},
34+
"noResultSearchHelp": {
35+
"enabled": true,
36+
"helpText": [
37+
"You can search by table name, variables, or table number",
38+
"Currently, you cannot search for content in the tables, such as the name of a municipality or county",
39+
"We're working to improve the search, so it will be easier to find the numbers you need"
40+
]
4641
}
4742
},
4843
"footer": {

docker/pxweb2/public/content/no/content.json

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
{
22
"startPage": {
3-
"breadCrumb": {
4-
"enabled": false,
5-
"items": [
6-
{
7-
"label": "Forsiden",
8-
"href": "#"
9-
},
10-
{
11-
"label": "Statistikkbanken",
12-
"href": "/"
13-
}
14-
]
15-
},
163
"detailsSection": {
174
"enabled": true,
185
"detailHeader": "Mer om Statistikkbanken",
@@ -51,6 +38,14 @@
5138
}
5239
}
5340
]
41+
},
42+
"noResultSearchHelp": {
43+
"enabled": true,
44+
"helpText": [
45+
"Du kan søke på tabellnavn, variabler og tabellnummer",
46+
"Foreløpig kan du ikke søke på innhold i tabellene, som navnet på en kommune eller et fylke",
47+
"Vi jobber med å gjøre søket bedre, slik at det blir enklere å finne tallene du trenger"
48+
]
5449
}
5550
},
5651
"footer": {

docker/pxweb2/public/content/sv/content.json

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
{
22
"startPage": {
3-
"breadCrumb": {
4-
"enabled": false,
5-
"items": [
6-
{
7-
"label": "Forsidan",
8-
"href": "#"
9-
},
10-
{
11-
"label": "Statistikdatabasen",
12-
"href": "/"
13-
}
14-
]
15-
},
163
"detailsSection": {
174
"enabled": true,
185
"detailHeader": "Mer om Statistikdatabasen",
@@ -36,6 +23,14 @@
3623
}
3724
}
3825
]
26+
},
27+
"noResultSearchHelp": {
28+
"enabled": true,
29+
"helpText": [
30+
"Du kan söka på tabellrubrik, variabler och tabellnummer",
31+
"För tillfället kan du inte söka på innehållet i tabellerna, som namnet på en kommun eller landskap",
32+
"Vi jobbar på att göra söken bättre så att det ska bli lättare att hitta de siffror du behöver"
33+
]
3934
}
4035
},
4136
"footer": {

docker/pxweb2/public/locales/ar/translation.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"drawer_save_file": "هناك المزيد من تنسيقات الملفات قيد العمل.",
5252
"drawer_save_api": "ميزة استعلام API قيد الإنشاء.",
5353
"drawer_edit": "يتم إنشاء المزيد من الأدوات لتحرير الجدول.",
54-
"drawer_help": "لن يُضاف أي محتوى هنا. يجب أن يرتبط زر المساعدة مباشرةً بصفحات المساعدة الخاصة به.",
54+
"drawer_help": "قسم المساعدة قيد الإنشاء. سيُتاح لك إنشاء روابط تُحيلك مباشرةً إلى صفحات المساعدة الخاصة بك.",
5555
"tab_definitions": "محتوى هذه علامة التبويب قيد الإنشاء."
5656
},
5757
"breadcrumbs": {
@@ -62,7 +62,9 @@
6262
},
6363
"start_page": {
6464
"header": "مرحبا بكم في التطبيق!",
65-
"welcome_trans_test": "مرحبا بكم في <1>برنامج</1> لبكسي ويب 2.0!"
65+
"welcome_trans_test": "مرحبا بكم في <1>برنامج</1> لبكسي ويب 2.0!",
66+
"skip_to_filter": "تخطي إلى الفلتر",
67+
"skip_to_result": "تخطي إلى النتيجة"
6668
},
6769
"presentation_page": {
6870
"side_menu": {
@@ -74,7 +76,6 @@
7476
"search": {
7577
"placeholder": "البحث في القائمة",
7678
"label": "يبحث",
77-
"aria_label_icon_text": "أيقونة البحث",
7879
"aria_label_clear_button_text": "مسح أيقونة البحث"
7980
},
8081
"header": {
@@ -96,7 +97,9 @@
9697
"values_list": {
9798
"aria_label": "قائمة {{total}} قيم.",
9899
"no_results_heading": "“{{search}}” لا توجد نتائج ل",
99-
"no_results_bodyshort": "جرّب كلمة رئيسية أو تهجئة مختلفة."
100+
"no_results_bodyshort": "جرّب كلمة رئيسية أو تهجئة مختلفة.",
101+
"showing_number_of_values": " {{searchResultsCount}} قيم",
102+
"showing_number_of_one_value": " {{searchResultsCount}} قيمة"
100103
}
101104
}
102105
}
@@ -114,9 +117,16 @@
114117
"title": "يحرر",
115118
"customize": {
116119
"title": "تخصيص",
120+
"auto_pivot": {
121+
"title": "تحسين تخطيط الجدول",
122+
"aria_label": "تحسين تخطيط الجدول",
123+
"description": "ينظم الصفوف والأعمدة تلقائيًا لتخطيط جدول أوضح",
124+
"screen_reader_announcement": "تم تحسين تخطيط الجدول وتنظيمه بعد {{first_variables}} و {{last_variable}}"
125+
},
117126
"pivot": {
118127
"title": "تدوير الجدول",
119128
"aria_label": "تدوير الجدول في اتجاه عقارب الساعة",
129+
"description": "",
120130
"screen_reader_announcement": "جدول مدور بعد {{first_variables}} و {{last_variable}}"
121131
},
122132
"rearrange": {

docker/pxweb2/public/locales/en/translation.json

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
"drawer_save_file": "More file formats are in the works.",
5252
"drawer_save_api": "Feature for API query is under construction.",
5353
"drawer_edit": "More tools for editing the table are under construction.",
54-
"drawer_help": "No content will be added here. The help button must be set up to link directly to your own help pages.",
54+
"drawer_help": "The help section is under construction. It will be possible to set up links that point directly to your own help pages.",
5555
"tab_definitions": "The content of this tab is under construction."
5656
},
5757
"breadcrumbs": {
5858
"aria_label_breadcrumb": "Breadcrumb",
5959
"breadcrumb_root_title": "Home",
60+
"breadcrumb_home_title": "Home",
6061
"show_more_breadcrumbs": "Show more"
6162
}
6263
},
@@ -65,9 +66,14 @@
6566
"ingress": "Looking for the perfect table? Use the search field and filters to dig into the numbers you need. Whether you're hunting for trends, facts, or just an oddly satisfying dataset, PxWeb 2.0 has your back.",
6667
"more_about_label": "More about PxWeb 2.0",
6768
"more_about_text": "More about Text EN",
69+
"no_result_header": "We couldn't find any tables",
70+
"no_result_description": "Try a different keyword or adjust your filters.",
71+
"no_result_search_help": "Search help",
6872
"result_hidden_header": "Result",
6973
"search_label": "Search in PxWeb 2.0",
7074
"search_placeholder": "Search for table names or variables",
75+
"skip_to.filter": "Skip to filter",
76+
"skip_to.result": "Skip to result",
7177
"filter": {
7278
"button": "Filter",
7379
"back": "Back",
@@ -127,7 +133,6 @@
127133
"search": {
128134
"placeholder": "Search in list",
129135
"label": "Search",
130-
"aria_label_icon_text": "Search icon",
131136
"aria_label_clear_button_text": "Clear search icon"
132137
},
133138
"header": {
@@ -149,7 +154,9 @@
149154
"values_list": {
150155
"aria_label": "List of {{total}} values.",
151156
"no_results_heading": "No results for “{{search}}”",
152-
"no_results_bodyshort": "Try a different keyword or spelling."
157+
"no_results_bodyshort": "Try a different keyword or spelling.",
158+
"showing_number_of_values": " {{searchResultsCount}} results",
159+
"showing_number_of_one_value": " {{searchResultsCount}} result"
153160
}
154161
}
155162
}
@@ -166,10 +173,17 @@
166173
"edit": {
167174
"title": "Edit",
168175
"customize": {
169-
"title": "Customize",
176+
"title": "Customise",
177+
"auto_pivot": {
178+
"title": "Improve table layout",
179+
"aria_label": "Improve table layout",
180+
"description": "Organises rows and columns automatically for a clearer table layout",
181+
"screen_reader_announcement": "Table layout improved and organised after {{first_variables}} and {{last_variable}}"
182+
},
170183
"pivot": {
171184
"title": "Rotate table",
172185
"aria_label": "Rotate table clockwise",
186+
"description": "",
173187
"screen_reader_announcement": "Table rotated after {{first_variables}} and {{last_variable}}"
174188
},
175189
"rearrange": {
@@ -243,7 +257,7 @@
243257
"main_content": {
244258
"expand_view": "Expand view",
245259
"shrink_view": "Shrink view",
246-
"last_updated": "Last updated",
260+
"last_updated": "Updated",
247261
"show_details": "Show details",
248262
"dynamic_table_title": "{{table_content_type}} by {{table_content_label_first_part}} and {{table_content_label_last_part}}",
249263
"table": {
@@ -296,7 +310,7 @@
296310
"link": "Link",
297311
"copyright": "Copyright",
298312
"matrix": "Matrix",
299-
"last_updated": "Last updated",
313+
"last_updated": "Updated",
300314
"next_update": "Next update",
301315
"source": "Source",
302316
"official_statistics": "Official statistics",

docker/pxweb2/public/locales/no/translation.json

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
"drawer_save_file": "Flere filformat er under arbeid.",
5252
"drawer_save_api": "Funksjon for API-spørring er under arbeid.",
5353
"drawer_edit": "Flere verktøy for å redigere tabellen er under arbeid.",
54-
"drawer_help": "Det vil ikke komme noe innhold her. Knappen for hjelp må kobles direkte til egne hjelpesider.",
54+
"drawer_help": "Området for hjelp er under arbeid. Her vi det bli mulig å legge til lenker som kobles direkte til egne hjelpesider.",
5555
"tab_definitions": "Innholdet til denne fanen er under arbeid."
5656
},
5757
"breadcrumbs": {
5858
"aria_label_breadcrumb": "Brødsmulesti",
59-
"breadcrumb_root_title": "Hjem",
59+
"breadcrumb_home_title": "Hjem",
60+
"breadcrumb_root_title": "Nye statistikkbanken",
6061
"show_more_breadcrumbs": "Vis mer"
6162
}
6263
},
@@ -65,9 +66,14 @@
6566
"ingress": "Leter du etter den perfekte tabellen? Bruk søkefeltet og filtrene for å finne tallene du trenger. Enten du er på jakt etter trender, fakta eller bare et merkelig tilfredsstillende datasett, så har PxWeb 2.0 det du trenger.",
6667
"more_about_label": "Mer om Statistikkbanken",
6768
"more_about_text": "More about Text NO",
69+
"no_result_header": "Vi fant ingen tabeller",
70+
"no_result_description": "Prøv med et annet søkeord eller juster valgt filtrering.",
71+
"no_result_search_help": "Søkehjelp",
6872
"result_hidden_header": "Resultat",
6973
"search_label": "Søk i Statistikkbanken",
7074
"search_placeholder": "Søk etter tabellnavn eller variabler",
75+
"skip_to.filter": "Gå til filter",
76+
"skip_to.result": "Gå til resultat",
7177
"filter": {
7278
"button": "Filter",
7379
"back": "Tilbake",
@@ -127,7 +133,6 @@
127133
"search": {
128134
"placeholder": "Søk i listen",
129135
"label": "Søk",
130-
"aria_label_icon_text": "Søkeikon",
131136
"aria_label_clear_button_text": "Ikon for å fjerne tekst i søkefeltet"
132137
},
133138
"header": {
@@ -149,7 +154,9 @@
149154
"values_list": {
150155
"aria_label": "Liste av {{total}} verdier.",
151156
"no_results_heading": "Ingen treff på «{{search}}»",
152-
"no_results_bodyshort": "Prøv med et annet søkeord eller en annen stavemåte."
157+
"no_results_bodyshort": "Prøv med et annet søkeord eller en annen stavemåte.",
158+
"showing_number_of_values": " {{searchResultsCount}} treff",
159+
"showing_number_of_one_value": " {{searchResultsCount}} treff"
153160
}
154161
}
155162
}
@@ -167,9 +174,16 @@
167174
"title": "Rediger",
168175
"customize": {
169176
"title": "Tilpass",
177+
"auto_pivot": {
178+
"title": "Rydd opp i tabellen",
179+
"aria_label": "Rydd opp i tabellen",
180+
"description": "Gjør tabellen mer oversiktlig ved å automatisk organisere rader og kolonner",
181+
"screen_reader_announcement": "Tabell ryddet opp og organisert etter {{first_variables}} og {{last_variable}}"
182+
},
170183
"pivot": {
171184
"title": "Roter tabellen",
172185
"aria_label": "Roter tabellen mot høyre",
186+
"description": "",
173187
"screen_reader_announcement": "Tabell rotert etter {{first_variables}} og {{last_variable}}"
174188
},
175189
"rearrange": {
@@ -243,7 +257,7 @@
243257
"main_content": {
244258
"expand_view": "Utvid visning",
245259
"shrink_view": "Minimer visning",
246-
"last_updated": "Sist oppdatert",
260+
"last_updated": "Oppdatert",
247261
"show_details": "Vis detaljer",
248262
"dynamic_table_title": "{{table_content_type}} etter {{table_content_label_first_part}} og {{table_content_label_last_part}}",
249263
"table": {
@@ -296,7 +310,7 @@
296310
"link": "Lenke",
297311
"copyright": "Opphavsrett",
298312
"matrix": "Matrise",
299-
"last_updated": "Sist oppdatert",
313+
"last_updated": "Oppdatert",
300314
"next_update": "Neste oppdatering",
301315
"source": "Kilde",
302316
"official_statistics": "Offisiell statistikk",
@@ -325,8 +339,8 @@
325339
}
326340
},
327341
"date": {
328-
"simple_date": "{{value, datetime}}",
329-
"simple_date_with_time": "{{value, datetime(year: 'numeric'; month: 'numeric'; day: 'numeric'; hour: 'numeric'; minute: 'numeric')}}"
342+
"simple_date": "{{value, datetime(day: '2-digit'; month: '2-digit'; year: 'numeric')}}",
343+
"simple_date_with_time": "{{value, datetime(year: 'numeric'; month: '2-digit'; day: '2-digit'; hour: 'numeric'; minute: 'numeric')}}"
330344
},
331345
"number": {
332346
"simple_number": "{{value, pxNumber}}",

0 commit comments

Comments
 (0)