Revision: 3558 Author: hans URL: http://bknr.net/trac/changeset/3558
Language related fixes.
U trunk/projects/bos/payment-website/infosystem/javascript.js U trunk/projects/bos/payment-website/static/bos.js U trunk/projects/bos/payment-website/templates/da/infosystem.xml U trunk/projects/bos/payment-website/templates/da/quittung.xml U trunk/projects/bos/payment-website/templates/da/ring-detail.xml U trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/da/toplevel.xml U trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml U trunk/projects/bos/payment-website/templates/da/toplevel_main.xml U trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/da/versand_info.xml U trunk/projects/bos/payment-website/templates/de/infosystem.xml U trunk/projects/bos/payment-website/templates/de/quittung.xml U trunk/projects/bos/payment-website/templates/de/ring-detail.xml U trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/de/toplevel.xml U trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml U trunk/projects/bos/payment-website/templates/de/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/toplevel_news.xml U trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/en/infosystem.xml U trunk/projects/bos/payment-website/templates/en/quittung.xml U trunk/projects/bos/payment-website/templates/en/ring-detail.xml U trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/en/toplevel.xml U trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml U trunk/projects/bos/payment-website/templates/en/toplevel_main.xml U trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/en/versand_info.xml U trunk/projects/bos/web/webserver.lisp
Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2008-07-22 14:41:01 UTC (rev 3558) @@ -158,7 +158,7 @@
dbg("<br/> -> lade POI"); poicomplete = false; - window.frames['data'].window.location.replace(http_pfad + "/poi-javascript"); + window.frames['data'].window.location.replace(http_pfad + "/poi-javascript?lang=" + document.language); poi_warten(); // starten der Wartenfunktion
return true;
Modified: trunk/projects/bos/payment-website/static/bos.js =================================================================== --- trunk/projects/bos/payment-website/static/bos.js 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/static/bos.js 2008-07-22 14:41:01 UTC (rev 3558) @@ -22,7 +22,7 @@
// *** extrafenster fuer satellitenkarte *** // function window_infosys() { - var url = "/infosystem"; + var url = "/infosystem/" + document.body.lang + "/satellitenkarte.htm";
var sponsorid_input = document.getElementById('sponsorid-input'); var password_input = document.getElementById('password-input');
Modified: trunk/projects/bos/payment-website/templates/da/infosystem.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/infosystem.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/infosystem.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -11,7 +11,7 @@ <title>Regnskov i SAMBOJA LESTARI - Infosystem</title> </head>
-<body> +<body bos:lang="$(language)"> <div id="header_infosystem"> </div> <div id="content_infosystem">
Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/quittung.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>Regnskov i SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/da/ring-detail.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ring-detail.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/ring-detail.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -13,7 +13,7 @@ </script> <title>Scheme for the "ring"</title> </head> - <body> + <body bos:lang="$(language)"> <div id="content_extra"> <h1 class="ringschema">Scheme for the "ring"</h1> <img src="/images/ring_detail_en.jpg" />
Modified: trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>Regnskov i SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -12,7 +12,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(titel)</title> </head> -<body> +<body bos:lang="$(language)">
<!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -11,7 +11,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(titel)</title> </head> - <body> + <body bos:lang="$(language)"> <div id="header_extra"> </div> <div id="content_extra">
Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/da/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_info.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/versand_info.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>Regnskov i SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/de/infosystem.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/infosystem.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/infosystem.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -12,7 +12,7 @@ <title>REGENWALD für SAMBOJA LESTARI - Infosystem</title> </head>
-<body> +<body bos:lang="$(language)"> <div id="header_infosystem"> </div> <div id="content_infosystem">
Modified: trunk/projects/bos/payment-website/templates/de/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/quittung.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/quittung.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/de/ring-detail.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/ring-detail.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/ring-detail.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -13,7 +13,7 @@ </script> <title>Ringschema</title> </head> - <body> + <body bos:lang="$(language)"> <div id="content_extra"> <h1 class="ringschema">Ringschema</h1> <img src="/images/ring_detail.jpg" />
Modified: trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/de/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -15,7 +15,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> -<body> +<body bos:lang="$(language)">
<!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <div id="header_extra"> </div> <div id="content_extra">
Modified: trunk/projects/bos/payment-website/templates/de/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -17,7 +17,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/de/toplevel_news.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -14,7 +14,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/en/infosystem.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/infosystem.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/infosystem.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -12,7 +12,7 @@ <title>RAINFOREST for SAMBOJA LESTARI - Infosystem</title> </head>
-<body> +<body bos:lang="$(language)"> <div id="header_infosystem"> </div> <div id="content_infosystem">
Modified: trunk/projects/bos/payment-website/templates/en/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/quittung.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/quittung.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>RAINFOREST for SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/en/ring-detail.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/ring-detail.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/ring-detail.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -13,7 +13,7 @@ </script> <title>Scheme for the "ring"</title> </head> - <body> + <body bos:lang="$(language)"> <div id="content_extra"> <h1 class="ringschema">Scheme for the "ring"</h1> <img src="/images/ring_detail_en.jpg" />
Modified: trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>RAINFOREST for SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/en/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -17,7 +17,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> -<body> +<body bos:lang="$(language)">
<!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <div id="header_extra"> </div> <div id="content_extra">
Modified: trunk/projects/bos/payment-website/templates/en/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -15,7 +15,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/payment-website/templates/en/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/versand_info.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/versand_info.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />--> <title>RAINFOREST for SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)"> <!-- header and menu_top --> <div id="header">
Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/web/webserver.lisp 2008-07-22 14:41:01 UTC (rev 3558) @@ -54,7 +54,8 @@ (call-next-method handler template-name))
(defmethod initial-template-environment ((expander worldpay-template-handler)) - (append (list (cons :website-url *website-url*)) + (append (list (cons :website-url *website-url*) + (cons :language (request-language))) (call-next-method)))
(define-persistent-class website-language () @@ -104,17 +105,6 @@ *default-language*)) :code hunchentoot:+http-moved-permanently+))
-(defclass infosystem-handler (page-handler) - ()) - -(defmethod handle ((handler infosystem-handler)) - ;; XXX hier logout-parameter implementieren - (with-query-params (logout) - (when logout - (hunchentoot:remove-session hunchentoot:*session*))) - (let ((language (request-language))) - (redirect #?"/infosystem/$(language)/satellitenkarte.htm"))) - (defclass certificate-handler (object-handler) () (:default-initargs :class 'contract)) @@ -182,7 +172,7 @@ (or (hunchentoot:aux-request-value :language) *default-language*))
-(defmethod handle :before ((handler page-handler)) +(defmethod handle :before ((handler page-handler)) (setf (hunchentoot:aux-request-value :language) (or (query-param "language") (query-param "lang") @@ -238,7 +228,6 @@ ("/cert-regen" cert-regen-handler) ("/admin" admin-handler) ("/languages" languages-handler) - ("/infosystem" infosystem-handler) ("/overview" image-tile-handler) ("/enlarge-overview" enlarge-tile-handler) ("/create-contract" create-contract-handler)
-
BKNR Commits