From ac17ad0fe7d1207fd6ba9220596df64c2b7c8f34 Mon Sep 17 00:00:00 2001 From: fpeters <> Date: Thu, 20 Nov 2003 12:59:16 +0000 Subject: [PATCH] =?UTF-8?q?-=20d=C3=A9finition=20de=20"profils=20d'utilisa?= =?UTF-8?q?tion"=20(granularit=C3=A9=20=C3=A0=20n=C3=A9gocier=20par=20la?= =?UTF-8?q?=20suite).=20-=20tr=C3=A8s=20bonne=20id=C3=A9e=20(c'est=20moi?= =?UTF-8?q?=20qui=20le=20dit)=20pour=20les=20commentaires:=20"commentaires?= =?UTF-8?q?=20=20=20=C3=A9ditoriaux"=20dont=20les=20lecteurs=20=3D=3D=20le?= =?UTF-8?q?s=20=C3=A9diteurs=20de=20l'objet=20comment=C3=A9=20-=20moi=20au?= =?UTF-8?q?ssi=20j'avais=20corrig=C3=A9=20le=20generalPublic=20dans=20les?= =?UTF-8?q?=20virtualhost=20-=20les=20tests=20ont=20l'air=20de=20tourner?= =?UTF-8?q?=20(pas=20r=C3=A9essay=C3=A9=20aujourd'hui)=20-=20modifs=20dive?= =?UTF-8?q?rses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 24 +- README.config | 14 - debian/changelog | 4 +- glasnost-web/code/webhandler.py | 9 +- po/glasnost-web/de.po | 510 +++++++++-------- po/glasnost-web/es.po | 459 ++++++++------- po/glasnost-web/fi.po | 510 +++++++++-------- po/glasnost-web/fr.po | 527 ++++++++++-------- po/glasnost-web/messages.pot | 456 ++++++++------- po/glasnost-web/sv.po | 510 +++++++++-------- profiles/.cvsignore | 2 + profiles/basic.xml.in | 15 + profiles/cards.xml.in | 8 + profiles/cms.xml.in | 10 + profiles/comments.xml.in | 8 + profiles/ldap.xml.in | 9 + profiles/translations.xml.in | 8 + profiles/vote.xml.in | 12 + scripts/editArticle.py | 2 +- scripts/setInitialSettings.py | 2 +- .../AppointmentsServer/AppointmentsServer.py | 57 +- servers/ArticlesServer/ArticlesServer.py | 38 +- servers/AtomsServer/AtomsServer.py | 3 +- servers/CommentsServer/CommentsServer.py | 13 +- servers/Dispatcher/Dispatcher.py | 85 ++- servers/GradesServer/GradesServer.py | 3 +- servers/GroupsServer/GroupsServer.py | 4 +- .../PreferencesServer/PreferencesServer.py | 4 +- .../TranslationsServer/TranslationsServer.py | 3 +- .../UploadFilesServer/UploadFilesServer.py | 16 +- .../VirtualHostsServer/VirtualHostsServer.py | 120 +++- servers/VotesServer/VotesServer.py | 9 +- shared/common/CardsCommon.py | 12 +- shared/common/CommentsCommon.py | 20 +- shared/common/ObjectsCommon.py | 4 +- shared/common/PeopleCommon.py | 4 +- shared/common/VirtualHostsCommon.py | 84 ++- shared/common/XhtmlGenerator.py | 12 +- shared/common/faults.py | 7 + shared/common/kinds.py | 114 ++-- shared/common/modes.py | 8 +- shared/common/tools.py | 30 - shared/common/widgets.py | 8 +- shared/common/xhtmlgenerator.py | 3 + shared/gcurses/Rubrics.py | 9 +- shared/gtk/kinds.py | 5 - shared/proxy/CommentsProxy.py | 18 +- shared/proxy/DispatcherProxy.py | 5 +- shared/proxy/ObjectsProxy.py | 14 +- shared/proxy/VirtualHostsProxy.py | 5 +- shared/proxy/kinds.py | 5 - shared/proxy/tools.py | 8 +- shared/server/ObjectsServer.py | 65 +-- shared/server/kinds.py | 5 - shared/web/AppointmentsWeb.py | 6 +- shared/web/AuthenticationLoginPasswordWeb.py | 4 +- shared/web/CommentsWeb.py | 65 ++- shared/web/ElectionsWeb.py | 6 +- shared/web/GroupsWeb.py | 6 +- shared/web/ObjectsWeb.py | 63 +-- shared/web/UploadFilesWeb.py | 3 + shared/web/WebAPI.py | 6 +- shared/web/kinds.py | 14 +- shared/web/tools.py | 12 +- shared/web/widgets.py | 53 +- .../entrouvert.be/StandardLookAndFeel.html | 2 +- .../web/css/glasnost.css | 3 +- templates/watercolor/web/css/watercolor.css | 7 + templates/www.entrouvert.com/.cvsignore | 4 + tests/SpipTests.py | 8 +- tests/WebTests.py | 4 + 71 files changed, 2327 insertions(+), 1838 deletions(-) create mode 100644 profiles/.cvsignore create mode 100644 profiles/basic.xml.in create mode 100644 profiles/cards.xml.in create mode 100644 profiles/cms.xml.in create mode 100644 profiles/comments.xml.in create mode 100644 profiles/ldap.xml.in create mode 100644 profiles/translations.xml.in create mode 100644 profiles/vote.xml.in create mode 100644 templates/www.entrouvert.com/.cvsignore diff --git a/Makefile b/Makefile index 33003140..6596ded6 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ TEMPLATES=default april bxlug codelutin.org cuisine easter-eggs entrouvert.com e RPM_PACKAGE_NAME=python$(PYTHON_VERSION)-tal python$(PYTHON_VERSION)-imaging python$(PYTHON_VERSION)-docutils -.PHONY: help archive clean data-archive dist dist-clean install-create-dir install-glasnost install-data install-extensions install-gtk install-locale install-log install-python-libs install-scripts install-servers install-templates install-web install mo po glasnost.spec rpm rpm-depend uninstall config +.PHONY: help archive clean data-archive dist dist-clean install-create-dir install-glasnost install-data install-extensions install-gtk install-locale install-log install-python-libs install-scripts install-servers install-templates install-web install mo po profiles-xml glasnost.spec rpm rpm-depend uninstall help: @echo @@ -196,13 +196,12 @@ infos-xml: do \ intltool-merge -x po/glasnost-web/ $$F `dirname $$F`/`basename $$F .in`; \ done - + install-create-dir: -mkdir -p "$(DESTDIR)/$(BIN_DIR)" -mkdir -p "$(DESTDIR)/$(DATA_DIR)" -mkdir -p "$(DESTDIR)/$(GLASNOST_DIR)" -mkdir -p "$(DESTDIR)/$(ETC_DIR)" - -mkdir -p "$(DESTDIR)/etc/init.d" -mkdir -p "$(DESTDIR)/$(EXTENSIONS_DIR)" -mkdir -p "$(DESTDIR)/$(LIBS_DIR)" -mkdir -p "$(DESTDIR)/$(LOCALE_DIR)" @@ -214,9 +213,9 @@ install-create-dir: -mkdir -p "$(DESTDIR)/$(TEMPLATES_DIR)" -mkdir -p "$(DESTDIR)/$(WEB_DIR)" -install-glasnost: config +install-glasnost: config profiles-xml @mkdir -p "$(DESTDIR)/$(GLASNOST_DIR)" - -cp $^ "$(DESTDIR)/$(GLASNOST_DIR)"/ + -cp config "$(DESTDIR)/$(GLASNOST_DIR)"/ @if test -e "$(DESTDIR)/$(SBIN_DIR)/$(GLASNOST)"; then \ rm -f "$(DESTDIR)/$(SBIN_DIR)/$(GLASNOST)"; \ else :; fi @@ -234,6 +233,8 @@ install-glasnost: config test ! -e "$(DESTDIR)/$(ETC_DIR)/config" || \ cp "$(DESTDIR)/$(ETC_DIR)/config" "$(DESTDIR)/$(ETC_DIR)/config.save" test -e "$(DESTDIR)/$(ETC_DIR)/config" || cp config "$(DESTDIR)/$(ETC_DIR)/config" + test -d "$(DESTDIR)/$(ETC_DIR)/profiles" || mkdir "$(DESTDIR)/$(ETC_DIR)/profiles" + cp profiles/*.xml "$(DESTDIR)/$(ETC_DIR)/profiles" install-data: @if ! test -e "$(DESTDIR)/$(DATA_DIR)"; then \ @@ -309,7 +310,7 @@ install-templates: infos-xml -mkdir -p "$(DESTDIR)/$(TEMPLATES_DIR)" for F in $(TEMPLATES); \ do \ - (cd templates && tar c --exclude CVS --exclude '*.in' --exclude '*.in.h' $$F) | (cd "$(DESTDIR)/$(TEMPLATES_DIR)" && tar x); \ + (cd templates && $(TAR) c --exclude CVS --exclude '*.in' --exclude '*.in.h' $$F) | (cd "$(DESTDIR)/$(TEMPLATES_DIR)" && $(TAR) x); \ done install-web: @@ -356,6 +357,13 @@ mo: po/glasnost-web/de.po \ msgfmt --statistics -c -v -o locale/fr/LC_MESSAGES/glasnost-web.mo po/glasnost-web/fr.po msgfmt --statistics -c -v -o locale/sv/LC_MESSAGES/glasnost-web.mo po/glasnost-web/sv.po +profiles-xml: + for F in `$(FIND) profiles/ -type f -name '*.xml.in'`; \ + do \ + intltool-merge -x po/glasnost-web/ $$F `dirname $$F`/`basename $$F .in`; \ + done + + talTranslations.py: templates/ ./talGettext.py templates/ > talTranslations.py @@ -372,12 +380,12 @@ po: glasnost-web/ \ cp po/glasnost-web/fi.po po/glasnost-web/fi.pox cp po/glasnost-web/fr.po po/glasnost-web/fr.pox cp po/glasnost-web/sv.po po/glasnost-web/sv.pox - for F in `$(FIND) templates/ -type f -name '*.xml.in'`; \ + for F in `$(FIND) profiles/ templates/ -type f -name '*.xml.in'`; \ do \ intltool-extract --type=gettext/xml $$F; \ done $(GETTEXT) -d po/glasnost-web/messages -k N_ `$(FIND) $^ -type f -name "*.py"` \ - `$(FIND) templates/ -type f -name '*.xml.in.h'` + `$(FIND) profiles/ templates/ -type f -name '*.xml.in.h'` msgmerge -o po/glasnost-web/de.po -D po/glasnost-web de.pox messages.pot msgmerge -o po/glasnost-web/es.po -D po/glasnost-web es.pox messages.pot msgmerge -o po/glasnost-web/fi.po -D po/glasnost-web fi.pox messages.pot diff --git a/README.config b/README.config index a331af25..bc2586d7 100644 --- a/README.config +++ b/README.config @@ -37,9 +37,6 @@ UseBalloonHelp = true # Cache files? (boolean, default: false) CacheFiles = false -# Domains to use for translations going through gettext (don't change) -GettextDomains = glasnost-web - Per dispatcher options ---------------------- @@ -80,9 +77,6 @@ Debug: DisableSpellchecking: Disable spellchecking (used in