From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 6 Oct 2014 10:19:30 +0000 (+0000)
Subject: Change declared template file encoding to UTF-8
X-Git-Tag: v_3_0_22~73
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/static/faq/@default-cgi@show-url-info?a=commitdiff_plain;h=340769f5fc2e7b1f94d509ff56ebf98133965252;p=privoxy.git
Change declared template file encoding to UTF-8
The files already used a subset of UTF-8 anyway and changing
the declaration allows to properly display UTF-8 characters
used in the action files.
This change may require existing action files with ISO-8859-1
characters that aren't valid UTF-8 to be converted to UTF-8.
Requested by Sam Chen in #582.
---
diff --git a/templates/blocked b/templates/blocked
index eeb5f8cc..5510e56b 100644
--- a/templates/blocked
+++ b/templates/blocked
@@ -90,7 +90,7 @@
<title>Request blocked (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico" type="image/x-icon">
<style type="text/css">
diff --git a/templates/cgi-error-404 b/templates/cgi-error-404
index 4e010c0e..0f9dc7de 100644
--- a/templates/cgi-error-404
+++ b/templates/cgi-error-404
@@ -72,7 +72,7 @@
<title>404 - Privoxy Configuration Page not found</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/cgi-error-bad-param b/templates/cgi-error-bad-param
index f8e95a98..9872cd47 100644
--- a/templates/cgi-error-bad-param
+++ b/templates/cgi-error-bad-param
@@ -72,7 +72,7 @@
<title>Privoxy: Bad parameter</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/cgi-error-disabled b/templates/cgi-error-disabled
index b95de2ca..8f2c31e1 100644
--- a/templates/cgi-error-disabled
+++ b/templates/cgi-error-disabled
@@ -72,7 +72,7 @@
<title>Configuration Page Disabled</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/cgi-error-file b/templates/cgi-error-file
index 0d801fe1..aaf07f59 100644
--- a/templates/cgi-error-file
+++ b/templates/cgi-error-file
@@ -72,7 +72,7 @@
<title>Privoxy: Actions file not found</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/cgi-error-file-read-only b/templates/cgi-error-file-read-only
index 8137200e..c813f45e 100644
--- a/templates/cgi-error-file-read-only
+++ b/templates/cgi-error-file-read-only
@@ -72,7 +72,7 @@
<title>Privoxy: Cannot write to actions file</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/cgi-error-modified b/templates/cgi-error-modified
index 4c386264..0a1c370c 100644
--- a/templates/cgi-error-modified
+++ b/templates/cgi-error-modified
@@ -72,7 +72,7 @@
<title>Privoxy: URL out of date</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/cgi-error-parse b/templates/cgi-error-parse
index 7a07bf23..75f7d11d 100644
--- a/templates/cgi-error-parse
+++ b/templates/cgi-error-parse
@@ -72,7 +72,7 @@
<title>Privoxy: Parse error</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
diff --git a/templates/connect-failed b/templates/connect-failed
index 96b312e3..bc281044 100644
--- a/templates/connect-failed
+++ b/templates/connect-failed
@@ -80,7 +80,7 @@
<title>503 - Connect failed (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
diff --git a/templates/connection-timeout b/templates/connection-timeout
index c65e291c..476616c6 100644
--- a/templates/connection-timeout
+++ b/templates/connection-timeout
@@ -10,7 +10,7 @@
<title>504 - Connection timeout (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
diff --git a/templates/default b/templates/default
index a4bb7d04..fbc4a60c 100644
--- a/templates/default
+++ b/templates/default
@@ -72,7 +72,7 @@
<title>Privoxy@@my-hostname@</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form
index d1d92564..d54a09f8 100644
--- a/templates/edit-actions-add-url-form
+++ b/templates/edit-actions-add-url-form
@@ -52,7 +52,7 @@
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index b7f6c5ce..4f046723 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -69,7 +69,7 @@
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/edit-actions-list b/templates/edit-actions-list
index 0fab0694..f8e0091a 100644
--- a/templates/edit-actions-list
+++ b/templates/edit-actions-list
@@ -71,7 +71,7 @@
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form
index f653a060..48c9ff8a 100644
--- a/templates/edit-actions-remove-url-form
+++ b/templates/edit-actions-remove-url-form
@@ -58,7 +58,7 @@
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form
index c94492dc..74a3ea3d 100644
--- a/templates/edit-actions-url-form
+++ b/templates/edit-actions-url-form
@@ -56,7 +56,7 @@
<head>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico">
diff --git a/templates/forwarding-failed b/templates/forwarding-failed
index d555470b..ee3d3dd2 100644
--- a/templates/forwarding-failed
+++ b/templates/forwarding-failed
@@ -85,7 +85,7 @@
<title>503 - Forwarding failure (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
diff --git a/templates/no-server-data b/templates/no-server-data
index f752476c..844dec32 100644
--- a/templates/no-server-data
+++ b/templates/no-server-data
@@ -10,7 +10,7 @@
<title>502 - No server or forwarder data received (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
diff --git a/templates/no-such-domain b/templates/no-such-domain
index cae2c735..9ce2e6fe 100644
--- a/templates/no-such-domain
+++ b/templates/no-such-domain
@@ -82,7 +82,7 @@
<title>404 - No such Domain (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
diff --git a/templates/show-request b/templates/show-request
index be8536aa..58648872 100644
--- a/templates/show-request
+++ b/templates/show-request
@@ -77,7 +77,7 @@
<title>Privoxy@@my-hostname@</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/show-status b/templates/show-status
index 67756346..79e33304 100644
--- a/templates/show-status
+++ b/templates/show-status
@@ -111,7 +111,7 @@
<title>Privoxy@@my-hostname@: Proxy Status</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/show-status-file b/templates/show-status-file
index ec03b360..38b3369f 100644
--- a/templates/show-status-file
+++ b/templates/show-status-file
@@ -80,7 +80,7 @@
<title>Privoxy@@my-hostname@: Contents of @file-description@</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/show-url-info b/templates/show-url-info
index 0007e066..80e6f669 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -122,7 +122,7 @@
<title>Privoxy@@my-hostname@ URL Info</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/show-version b/templates/show-version
index 65efb5a9..35d77a7e 100644
--- a/templates/show-version
+++ b/templates/show-version
@@ -88,7 +88,7 @@
<title>Privoxy@@my-hostname@: Detailed proxy version information</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/toggle b/templates/toggle
index fa8ea6d0..7637fc9a 100644
--- a/templates/toggle
+++ b/templates/toggle
@@ -73,7 +73,7 @@
<title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/toggle-mini b/templates/toggle-mini
index 02946cde..320efb42 100644
--- a/templates/toggle-mini
+++ b/templates/toggle-mini
@@ -73,7 +73,7 @@
<title>@if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@ - Privoxy@@my-hostname@</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="stylesheet" type="text/css" href="@default-cgi@send-stylesheet">
<link rel="shortcut icon" href="@default-cgi@favicon.ico" type="image/x-icon">
diff --git a/templates/untrusted b/templates/untrusted
index 7bde7c57..a645128a 100644
--- a/templates/untrusted
+++ b/templates/untrusted
@@ -91,7 +91,7 @@
<title>Untrusted request (Privoxy@@my-hostname@)</title>
<meta http-equiv="Content-Style-Type" content="text/css">
<meta http-equiv="Content-Script-Type" content="text/javascript">
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="robots" content="noindex,nofollow">
<link rel="shortcut icon" href="@default-cgi@error-favicon.ico">
<style type="text/css">
diff --git a/templates/url-info-osd.xml b/templates/url-info-osd.xml
index 3fbaaf12..ca48fe2e 100644
--- a/templates/url-info-osd.xml
+++ b/templates/url-info-osd.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>Privoxy URL Info</ShortName>
<Description>
Enter a URL to see which Privoxy actions apply.
Only works while the browser is configured to use Privoxy.
</Description>
- <InputEncoding>ISO-8859-1</InputEncoding>
- <OutputEncoding>ISO-8859-1</OutputEncoding>
+ <InputEncoding>UTF-8</InputEncoding>
+ <OutputEncoding>UTF-8</OutputEncoding>
<Developer>Privoxy Team</Developer>
<Contact>ijbswa-developers@lists.sourceforge.net</Contact>
<Image width="16" height="16" type="image/x-icon">@default-cgi@favicon.ico</Image>