From f9a07bcadd0e9bae90720dbb18533de77193a1ff Mon Sep 17 00:00:00 2001 From: Burer Date: Mon, 2 Mar 2026 11:09:15 +0000 Subject: [PATCH] rework and update banner on main page (#11) Refactor banner code to be more universal, and updated it's content to GSoC 2026. image.png Reviewed-on: https://git.kolibrios.org/KolibriOS/kolibrios.org/pulls/11 Reviewed-by: Gleb Zaharov Co-authored-by: Burer Co-committed-by: Burer --- configs/banner.ini | 3 ++ locales/de.ini | 7 ++-- locales/en.ini | 7 ++-- locales/es.ini | 7 ++-- locales/fr.ini | 7 ++-- locales/it.ini | 8 ++--- locales/nl.ini | 7 ++-- locales/ru.ini | 7 ++-- locales/zh-Hans.ini | 7 ++-- locales/zh-Hant.ini | 7 ++-- modules/configs.py | 50 +++++++++++++++++++++++++++++ modules/locales.py | 9 ++++++ static/img/{ => banners}/gitea.png | Bin static/img/banners/gsoc.png | Bin 0 -> 6879 bytes static/style.scss | 33 ++++++++++++------- templates/index.html | 2 +- templates/tmpl/_banner.htm | 17 ++++++++++ templates/tmpl/_git.htm | 19 ----------- 18 files changed, 138 insertions(+), 59 deletions(-) create mode 100644 configs/banner.ini create mode 100644 modules/configs.py rename static/img/{ => banners}/gitea.png (100%) create mode 100644 static/img/banners/gsoc.png create mode 100644 templates/tmpl/_banner.htm delete mode 100644 templates/tmpl/_git.htm diff --git a/configs/banner.ini b/configs/banner.ini new file mode 100644 index 0000000..4c1d396 --- /dev/null +++ b/configs/banner.ini @@ -0,0 +1,3 @@ +[banner] +url = https://summerofcode.withgoogle.com/programs/2026/organizations/kolibrios-project-team +img = gsoc.png diff --git a/locales/de.ini b/locales/de.ini index 5d547c9..fb0528b 100644 --- a/locales/de.ini +++ b/locales/de.ini @@ -14,9 +14,10 @@ forum = Forum wiki = Wiki git = Git -[git] -header = KolibriOS ist zu Git gewechselt! -text = Schau dir unsere neue entwicklerfreundliche Infrastruktur an +[banner] +header = KolibriOS wurde zu GSoC 2026 angenommen! +text = Informieren Sie sich über Programmdetails und unsere Projektideen +alt = GSoC [article] p1 = {kolibrios} ist ein winziges, aber unglaublich leistungsfähiges und diff --git a/locales/en.ini b/locales/en.ini index 99f2650..ad72b91 100644 --- a/locales/en.ini +++ b/locales/en.ini @@ -14,9 +14,10 @@ forum = Forum wiki = Wiki git = Git -[git] -header = KolibriOS moved to Git! -text = Check our new developers-friendly infrastructure +[banner] +header = KolibriOS accepted to GSoC 2026! +text = Check program details and our project ideas +alt = GSoC [article] p1 = {kolibrios} is a tiny yet incredibly powerful and fast operating system for diff --git a/locales/es.ini b/locales/es.ini index 9bcd658..b6b53e1 100644 --- a/locales/es.ini +++ b/locales/es.ini @@ -14,9 +14,10 @@ forum = Foro wiki = Wiki git = Git -[git] -header = ¡KolibriOS se ha trasladado a Git! -text = Mira nuestra nueva infraestructura amigable para desarrolladores +[banner] +header = ¡KolibriOS fue aceptado en GSoC 2026! +text = Consulta los detalles del programa y nuestras ideas de proyecto +alt = GSoC [article] p1 = {kolibrios} es un sistema operativo diminuto, pero increíblemente potente y diff --git a/locales/fr.ini b/locales/fr.ini index e349167..609b96b 100644 --- a/locales/fr.ini +++ b/locales/fr.ini @@ -14,9 +14,10 @@ forum = Forum wiki = Wiki git = Git -[git] -header = KolibriOS a déménagé sur Git ! -text = Découvrez notre nouvelle infrastructure conviviale pour les développeurs +[banner] +header = KolibriOS a été accepté au GSoC 2026 ! +text = Consultez les détails du programme et nos idées de projets +alt = GSoC [article] p1 = {kolibrios} est un système d`exploitation minuscule, mais incroyablement diff --git a/locales/it.ini b/locales/it.ini index ad9fa1d..5f691b2 100644 --- a/locales/it.ini +++ b/locales/it.ini @@ -14,10 +14,10 @@ forum = Forum wiki = Wiki git = Git -[git] -header = KolibriOS si è spostato su Git! -text = Dai un`occhiata alla nostra nuova infrastruttura pensata per gli - sviluppatori +[banner] +header = KolibriOS è stato accettato al GSoC 2026! +text = Consulta i dettagli del programma e le nostre idee di progetto +alt = GSoC [article] p1 = {kolibrios} è un sistema operativo minuscolo, ma incredibilmente potente e diff --git a/locales/nl.ini b/locales/nl.ini index 32978b1..da82371 100644 --- a/locales/nl.ini +++ b/locales/nl.ini @@ -14,9 +14,10 @@ forum = Forum wiki = Wiki git = Git -[git] -header = KolibriOS is verhuisd naar Git! -text = Bekijk onze nieuwe, ontwikkelaarsvriendelijke infrastructuur +[banner] +header = KolibriOS is geaccepteerd voor GSoC 2026! +text = Bekijk de programmadetails en onze projectideeën +alt = GSoC [article] p1 = {kolibrios} is een klein maar ongelooflijk krachtig en snel diff --git a/locales/ru.ini b/locales/ru.ini index 1eaa3ba..90f6df7 100644 --- a/locales/ru.ini +++ b/locales/ru.ini @@ -14,9 +14,10 @@ forum = Форум wiki = Вики git = Git -[git] -header = КолибриОС перешла на Git! -text = Ознакомьтесь с нашей новой, удобной для разработчиков инфраструктурой +[banner] +header = KolibriOS принята в GSoC 2026! +text = Ознакомьтесь с деталями программы и нашими идеями проектов +alt = GSoC [article] p1 = {kolibrios} — это крошечная, но невероятно мощная и быстрая операционная diff --git a/locales/zh-Hans.ini b/locales/zh-Hans.ini index c6db5f3..1b7084b 100644 --- a/locales/zh-Hans.ini +++ b/locales/zh-Hans.ini @@ -14,9 +14,10 @@ forum = 论坛 wiki = 百科 git = Git -[git] -header = KolibriOS 现已拥抱 Git！ -text = 来看看我们全新又对开发者友好的代码仓库吧： +[banner] +header = KolibriOS 已被 GSoC 2026 录取！ +text = 查看项目详情和我们的项目创意 +alt = GSoC [article] p1 = {kolibrios} 是一个体积微小、功能强大、响应迅速的，面向 x86 兼容机的操作系统。 diff --git a/locales/zh-Hant.ini b/locales/zh-Hant.ini index 594c3ef..2fb2796 100644 --- a/locales/zh-Hant.ini +++ b/locales/zh-Hant.ini @@ -14,9 +14,10 @@ forum = 論壇 wiki = 百科 git = Git -[git] -header = KolibriOS 現已移入 Git！ -text = 來看看我們又新又友好的代碼倉庫吧： +[banner] +header = KolibriOS 已入選 GSoC 2026！ +text = 查看計畫詳情和我們的專案構想 +alt = GSoC [article] p1 = {kolibrios} 是一個空間小、功能強、回應快的，面向 x86 兼容機的作業系統。 diff --git a/modules/configs.py b/modules/configs.py new file mode 100644 index 0000000..0ed6e8b --- /dev/null +++ b/modules/configs.py @@ -0,0 +1,50 @@ +from os import path, listdir +from configparser import ConfigParser +import threading + + +_configs = {} +_loaded = False +_load_lock = threading.Lock() + + +def load_all_configs(): + new_configs = {} + + configs_dir = "configs" + if not path.isdir(configs_dir): + return new_configs + + for filename in sorted(listdir(configs_dir)): + if not filename.endswith(".ini"): + continue + + file_path = path.join(configs_dir, filename) + cp = ConfigParser() + with open(file_path, encoding="utf-8") as f: + cp.read_file(f) + + for section in cp.sections(): + section_data = new_configs.setdefault(section, {}) + section_data.update(dict(cp[section])) + + return new_configs + + +def ensure_loaded(): + global _configs, _loaded + with _load_lock: + if _loaded: + return + _configs = load_all_configs() + _loaded = True + + +def get_section(name): + ensure_loaded() + return dict(_configs.get(name, {})) + + +def get_all_sections(): + ensure_loaded() + return {section: dict(values) for section, values in _configs.items()} diff --git a/modules/locales.py b/modules/locales.py index c9f698f..6ef9ba9 100644 --- a/modules/locales.py +++ b/modules/locales.py @@ -2,6 +2,8 @@ from os import path, listdir from configparser import ConfigParser import threading +from modules import configs + translations = {} locales_name = {} @@ -33,6 +35,13 @@ def load_all_locales(): section: dict(cp[section]) for section in cp.sections() } + shared_sections = configs.get_all_sections() + if shared_sections: + for locale_translation in new_translations.values(): + for section_name, section_values in shared_sections.items(): + locale_section = locale_translation.setdefault(section_name, {}) + locale_section.update(section_values) + new_locales_code = locales_code_default + tuple(sorted(locales_code_extra)) new_locales_name = { locale_code: new_translations[locale_code]["title"]["language"] diff --git a/static/img/gitea.png b/static/img/banners/gitea.png similarity index 100% rename from static/img/gitea.png rename to static/img/banners/gitea.png diff --git a/static/img/banners/gsoc.png b/static/img/banners/gsoc.png new file mode 100644 index 0000000000000000000000000000000000000000..ca348b536b2ceafef314eba63251962b842054db GIT binary patch literal 6879 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 - {% include 'tmpl/_git.htm' %} + {% include 'tmpl/_banner.htm' %} {% include 'tmpl/_article.htm' %} diff --git a/templates/tmpl/_banner.htm b/templates/tmpl/_banner.htm new file mode 100644 index 0000000..ca32245 --- /dev/null +++ b/templates/tmpl/_banner.htm @@ -0,0 +1,17 @@ + diff --git a/templates/tmpl/_git.htm b/templates/tmpl/_git.htm deleted file mode 100644 index d244f6b..0000000 --- a/templates/tmpl/_git.htm +++ /dev/null @@ -1,19 +0,0 @@ -