projects / mir.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2717d9c)
change the templates to use the charset taken from the message bundle of the current...
authormh <mh>
Sat, 18 Jan 2003 08:20:56 +0000 (08:20 +0000)
committermh <mh>
Sat, 18 Jan 2003 08:20:56 +0000 (08:20 +0000)
etc/open/posting.template patch | blob | history
etc/producer/article.template patch | blob | history
etc/producer/featurearchive.template patch | blob | history
etc/producer/newswirearchive.template patch | blob | history
etc/producer/startpage.template patch | blob | history
etc/producer/topicpage.template patch | blob | history
templates/admin/content.template patch | blob | history
templates/admin/login.template patch | blob | history
templates/admin/start_admin.template patch | blob | history

diff --git a/etc/open/posting.template b/etc/open/posting.template
index 73803f1..0ce2373 100755 (executable)
--- a/etc/open/posting.template
+++ b/etc/open/posting.template
@@ -6,7 +6,7 @@
        <meta name="author" content="${lang("posting.meta.author")}">
        <meta name="keywords" content="${lang("posting.meta.keywords")}">
        <!--<meta name="date" content="### Date ###Time">-->
-       <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+       <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">
        <meta name="robots" content="index">
        <meta name="robots" content="follow">
 
diff --git a/etc/producer/article.template b/etc/producer/article.template
index ac27822..14bb606 100755 (executable)
--- a/etc/producer/article.template
+++ b/etc/producer/article.template
@@ -5,7 +5,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">       
+       <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">    
     <title>${config["Mir.Name"]} | ${article.title}</title>
        <meta name="keywords" content="indymedia,imc">
        <meta name="description" content="indymedia,imc">
diff --git a/etc/producer/featurearchive.template b/etc/producer/featurearchive.template
index 8fd5fc5..5a5a464 100755 (executable)
--- a/etc/producer/featurearchive.template
+++ b/etc/producer/featurearchive.template
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+       <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">
     <title>${config["Mir.Name"]} | ${lang("featurearchive.title")}</title>
        <meta name="keywords" content="${lang("general.keywords")}">
        <meta name="description" content="${lang("featurearchive.title")}">
diff --git a/etc/producer/newswirearchive.template b/etc/producer/newswirearchive.template
index 5b9b800..8f15f3d 100755 (executable)
--- a/etc/producer/newswirearchive.template
+++ b/etc/producer/newswirearchive.template
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+       <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">
     <title>${config["Mir.Name"]} | ${lang("newswirearchive.title")}</title>
        <meta name="keywords" content="${lang("general.keywords")}">
        <meta name="description" content="${lang("newswirearchive.title")}">
diff --git a/etc/producer/startpage.template b/etc/producer/startpage.template
index 485d385..8836961 100755 (executable)
--- a/etc/producer/startpage.template
+++ b/etc/producer/startpage.template
@@ -7,7 +7,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">       
+       <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">    
        <title>${config["Mir.Name"]}</title>
        <meta name="keywords" content="indymedia,imc">
        <meta name="description" content="indymedia,imc">
diff --git a/etc/producer/topicpage.template b/etc/producer/topicpage.template
index e372834..2c4c095 100755 (executable)
--- a/etc/producer/topicpage.template
+++ b/etc/producer/topicpage.template
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+       <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">
     <title>${config["Mir.Name"]} | ${topic.title}</title>
        <meta name="keywords" content="${lang("general.keywords")}">
        <meta name="description" content="${topic.description}">
diff --git a/templates/admin/content.template b/templates/admin/content.template
index eca0d50..aab5f39 100755 (executable)
--- a/templates/admin/content.template
+++ b/templates/admin/content.template
@@ -2,7 +2,8 @@
   <head>
     <title>${lang("content.htmltitle")}</title>
     <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css"
-    <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+    <!-- this might one day need to be the lang of the article????? -->
+    <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset"}">
   </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
diff --git a/templates/admin/login.template b/templates/admin/login.template
index a3a6c36..d56c24d 100755 (executable)
--- a/templates/admin/login.template
+++ b/templates/admin/login.template
@@ -3,6 +3,7 @@
   <head>
     <title>${config["Mir.Name"]} | ${lang("login.htmltitle")}</title>
     <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css">
+    <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">
     <script language="JavaScript">
       function placeFocus() {
         document.forms[0].elements[1].focus();
diff --git a/templates/admin/start_admin.template b/templates/admin/start_admin.template
index 299e5a5..c35ba2c 100755 (executable)
--- a/templates/admin/start_admin.template
+++ b/templates/admin/start_admin.template
@@ -2,7 +2,7 @@
   <head>
     <title>${config["Mir.Name"]} | ${lang("start.htmltitle")}</title>
     <link rel="stylesheet" type="text/css" href="${config.docRoot}/style/admin.css"
-    <meta http-equiv="Content-Type" content="text/html; charset=${config["Mir.DefaultHTMLCharset"]}">
+    <meta http-equiv="Content-Type" content="text/html; charset=${lang("htmlcharset")}">
   </head>
 
 <body marginwidth="0" marginheight="0" topmargin="0" leftmargin="0">
The Mir CMS