From: Benoît Pin <pin@cri.ensmp.fr>
Date: Wed, 17 Sep 2014 14:49:33 +0000 (+0200)
Subject: Abandon du domaine i18n cmf_default
X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/commitdiff_plain/9e76287b3cab01ba1a2ba970e8da2dbc40bc6a93?ds=inline
Abandon du domaine i18n cmf_default
---
diff --git a/skins/content/file_view_template.pt b/skins/content/file_view_template.pt
index 50045ab..d910527 100755
--- a/skins/content/file_view_template.pt
+++ b/skins/content/file_view_template.pt
@@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body>
- <div metal:fill-slot="main" i18n:domain="cmf_default">
+ <div metal:fill-slot="main" i18n:domain="plinn">
<h2 i18n:translate="">File Properties</h2>
<table>
<tr>
diff --git a/skins/content/folder_edit_form.pt b/skins/content/folder_edit_form.pt
index f73eb87..bc684ee 100644
--- a/skins/content/folder_edit_form.pt
+++ b/skins/content/folder_edit_form.pt
@@ -7,7 +7,7 @@
<div metal:fill-slot="header">
<div metal:use-macro="here/widgets/macros/generic_header"></div>
</div>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
+<div metal:fill-slot="main" i18n:domain="plinn">
<div class="Desktop">
<form action="folder_edit" method="post"
diff --git a/skins/custom_content/favorite_view.pt b/skins/custom_content/favorite_view.pt
index 737ffbb..3cd268a 100755
--- a/skins/custom_content/favorite_view.pt
+++ b/skins/custom_content/favorite_view.pt
@@ -6,7 +6,7 @@
</head>
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
+<div metal:fill-slot="main" i18n:domain="plinn">
<p i18n:translate="">Link: <a href=""
tal:attributes="href here/getRemoteUrl"
diff --git a/skins/custom_content/file_edit_template.pt b/skins/custom_content/file_edit_template.pt
index 042fcc0..464135c 100755
--- a/skins/custom_content/file_edit_template.pt
+++ b/skins/custom_content/file_edit_template.pt
@@ -6,7 +6,7 @@
</head>
<body>
- <div i18n:domain="cmf_default">
+ <div i18n:domain="plinn">
<div metal:fill-slot="header">
<div metal:use-macro="here/widgets/macros/generic_header">
generic_header
diff --git a/skins/custom_content/image_edit_template.pt b/skins/custom_content/image_edit_template.pt
index 43b6630..48dcef3 100644
--- a/skins/custom_content/image_edit_template.pt
+++ b/skins/custom_content/image_edit_template.pt
@@ -9,7 +9,7 @@
generic_header macro
</div>
</div>
- <div metal:fill-slot="main" i18n:domain="cmf_default" tal:define="form options/form" tal:omit-tag="">
+ <div metal:fill-slot="main" i18n:domain="plinn" tal:define="form options/form" tal:omit-tag="">
<div class="Desktop">
<form action="image_edit_form" method="post" enctype="multipart/form-data" tal:attributes="action form/action">
<table class="FormLayout">
diff --git a/skins/custom_content/link_edit_template.pt b/skins/custom_content/link_edit_template.pt
index 6fd5ee5..96e024d 100644
--- a/skins/custom_content/link_edit_template.pt
+++ b/skins/custom_content/link_edit_template.pt
@@ -7,7 +7,7 @@
<div metal:fill-slot="header">
<div metal:use-macro="here/widgets/macros/generic_header">generic_header</div>
</div>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
+<div metal:fill-slot="main" i18n:domain="plinn">
<div class="Desktop">
<div class="Link">
diff --git a/skins/custom_content/link_view.pt b/skins/custom_content/link_view.pt
index c089edb..ae725bd 100755
--- a/skins/custom_content/link_view.pt
+++ b/skins/custom_content/link_view.pt
@@ -5,7 +5,7 @@
<base href="" metal:fill-slot="base" tal:attributes="href python: here.absolute_url() + '/'" />
</head>
<body>
- <div metal:fill-slot="main" i18n:domain="cmf_default">
+ <div metal:fill-slot="main" i18n:domain="plinn">
<p i18n:translate="">Link: <a href=""
tal:attributes="href here/remote_url"
diff --git a/skins/custom_content/newsitem_edit_template.pt b/skins/custom_content/newsitem_edit_template.pt
index ed7c952..61774d7 100644
--- a/skins/custom_content/newsitem_edit_template.pt
+++ b/skins/custom_content/newsitem_edit_template.pt
@@ -7,7 +7,7 @@
</head>
<body>
- <div i18n:domain="cmf_default">
+ <div i18n:domain="plinn">
<div metal:fill-slot="header">
<div metal:use-macro="here/widgets/macros/generic_header">
generic_header macro
diff --git a/skins/custom_generic/folder_contents_template.pt b/skins/custom_generic/folder_contents_template.pt
index c661a6b..77e9ea3 100644
--- a/skins/custom_generic/folder_contents_template.pt
+++ b/skins/custom_generic/folder_contents_template.pt
@@ -13,7 +13,7 @@
<div tal:define="hideContentByLine python:1" metal:fill-slot="header">
<div metal:use-macro="here/widgets/macros/generic_header">generic_header</div>
</div>
- <div metal:fill-slot="main" i18n:domain="cmf_default" tal:omit-tag=""
+ <div metal:fill-slot="main" i18n:domain="plinn" tal:omit-tag=""
tal:define="form options/form">
<form method="post" tal:attributes="action string:${here/absolute_url}/folder_contents">
<div id="FolderListing">
diff --git a/skins/custom_generic/index_html_utils.pt b/skins/custom_generic/index_html_utils.pt
index e14c13f..7b4e8b2 100755
--- a/skins/custom_generic/index_html_utils.pt
+++ b/skins/custom_generic/index_html_utils.pt
@@ -14,7 +14,7 @@
Document Description goes here.
</div>
</div>
- <div metal:define-macro="index_content" i18n:domain="cmf_default">
+ <div metal:define-macro="index_content" i18n:domain="plinn">
<div tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter;
types python:here.getTypeInfo().allowed_content_types ;
raw_items python: here.contentValues(filter={'portal_type': types } );
@@ -39,7 +39,7 @@
</div>
</div>
</div>
- <div metal:define-macro="index_links" i18n:domain="cmf_default">
+ <div metal:define-macro="index_links" i18n:domain="plinn">
<div tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter;
default_types python:( 'Link', 'Favorite', 'Topic');
types types | here/show_link_types | default_types;
@@ -65,7 +65,7 @@
</div>
</div>
</div>
- <div metal:define-macro="index_folders" i18n:domain="cmf_default">
+ <div metal:define-macro="index_folders" i18n:domain="plinn">
<div tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter;
default_types python:( 'Folder',);
types types | here/show_folder_types | default_types;
@@ -91,7 +91,7 @@
</div>
</div>
</div>
- <div metal:define-macro="news_box" i18n:domain="cmf_default">
+ <div metal:define-macro="news_box" i18n:domain="plinn">
<table class="NewsItems" width="100%" border="0" cellspacing="0" cellpadding="0">
<tbody tal:define="news python: here.portal_catalog( meta_type='News Item', sort_on='Date', sort_order='reverse', review_state='published');
Batch python:modules['ZTUtils'].Batch;
diff --git a/skins/custom_generic/join_template.pt b/skins/custom_generic/join_template.pt
index c8aa939..5b0f17b 100644
--- a/skins/custom_generic/join_template.pt
+++ b/skins/custom_generic/join_template.pt
@@ -5,7 +5,7 @@
<body>
-<metal:slot metal:fill-slot="main_no_tabs" i18n:domain="cmf_default"
+<metal:slot metal:fill-slot="main_no_tabs" i18n:domain="plinn"
tal:define="form options/form">
<h1 tal:content="options/title" i18n:translate="">Become a member</h1>
<div class="Desktop">
diff --git a/skins/custom_generic/logged_out.pt b/skins/custom_generic/logged_out.pt
index 1099fa4..d97853a 100644
--- a/skins/custom_generic/logged_out.pt
+++ b/skins/custom_generic/logged_out.pt
@@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body>
-<div metal:fill-slot="main_no_tabs" i18n:domain="cmf_default">
+<div metal:fill-slot="main_no_tabs" i18n:domain="plinn">
<p tal:condition="python: here.portal_membership.isAnonymousUser()"
tal:content="string:You have been logged out."
i18n:translate=""></p>
diff --git a/skins/custom_generic/mail_password_form.pt b/skins/custom_generic/mail_password_form.pt
index a9bdf65..3554f99 100755
--- a/skins/custom_generic/mail_password_form.pt
+++ b/skins/custom_generic/mail_password_form.pt
@@ -6,7 +6,7 @@
</head>
<body>
-<div metal:fill-slot="main_no_tabs" i18n:domain="cmf_default">
+<div metal:fill-slot="main_no_tabs" i18n:domain="plinn">
<div class="Desktop"
tal:define="ptool here/portal_properties">
diff --git a/skins/custom_generic/mail_password_response.pt b/skins/custom_generic/mail_password_response.pt
index 8368006..d15c808 100644
--- a/skins/custom_generic/mail_password_response.pt
+++ b/skins/custom_generic/mail_password_response.pt
@@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body>
-<div metal:fill-slot="main_no_tabs" i18n:domain="cmf_default">
+<div metal:fill-slot="main_no_tabs" i18n:domain="plinn">
<p id="DesktopStatusBar" i18n:translate="">Your password has been mailed.
<br />
It should arrive in your mailbox momentarily.</p>
diff --git a/skins/custom_generic/password_form.pt b/skins/custom_generic/password_form.pt
index ce447f3..ae276cf 100755
--- a/skins/custom_generic/password_form.pt
+++ b/skins/custom_generic/password_form.pt
@@ -4,7 +4,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body>
-<div class="config" metal:fill-slot="main_no_tabs" i18n:domain="cmf_default" tal:define="member python: here.portal_membership.getAuthenticatedMember()">
+<div class="config" metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:define="member python: here.portal_membership.getAuthenticatedMember()">
<h1 i18n:translate="">Change your Password</h1>
<div class="error"
tal:replace="request/error"
diff --git a/skins/custom_generic/personalize_form.pt b/skins/custom_generic/personalize_form.pt
index 149f1dc..dc608bf 100755
--- a/skins/custom_generic/personalize_form.pt
+++ b/skins/custom_generic/personalize_form.pt
@@ -4,7 +4,7 @@
</head>
<body>
- <div metal:fill-slot="main_no_tabs" i18n:domain="cmf_default">
+ <div metal:fill-slot="main_no_tabs" i18n:domain="plinn">
<div tal:define="purl here/portal_url;
mtool here/portal_membership;
member mtool/getAuthenticatedMember;
diff --git a/skins/custom_generic/reconfig_template.pt b/skins/custom_generic/reconfig_template.pt
index 075d511..65adf82 100644
--- a/skins/custom_generic/reconfig_template.pt
+++ b/skins/custom_generic/reconfig_template.pt
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
-<body metal:fill-slot="main_no_tabs" i18n:domain="cmf_default" tal:omit-tag="" tal:define="form options/form">
+<body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
<h1 i18n:translate="">Configure the Portal</h1>
diff --git a/skins/custom_generic/undo_form.pt b/skins/custom_generic/undo_form.pt
index 886c63b..bf8d2b7 100644
--- a/skins/custom_generic/undo_form.pt
+++ b/skins/custom_generic/undo_form.pt
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
lang="en"
metal:use-macro="here/main_template/macros/master"
- i18n:domain="cmf_default">
+ i18n:domain="plinn">
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
diff --git a/skins/generic/content_byline.pt b/skins/generic/content_byline.pt
index 9611e1f..3362e66 100644
--- a/skins/generic/content_byline.pt
+++ b/skins/generic/content_byline.pt
@@ -4,7 +4,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<title>Content by line</title>
</head>
- <body i18n:domain="cmf_default">
+ <body i18n:domain="plinn">
<div id="ContentByLine" metal:define-macro="byline"
tal:define="creator here/Creator;
creatorFullName python:mtool.getMemberFullNameById(creator, nameBefore=0) ;
diff --git a/skins/generic/folder_contents_macros.pt b/skins/generic/folder_contents_macros.pt
index 4a6bc04..009a3e2 100644
--- a/skins/generic/folder_contents_macros.pt
+++ b/skins/generic/folder_contents_macros.pt
@@ -7,7 +7,7 @@
<title>folder contents macros</title>
</head>
- <body i18n:domain="cmf_default" metal:define-macro="FolderListing"
+ <body i18n:domain="plinn" metal:define-macro="FolderListing"
tal:define="batch_dict options/batch;
batch batch_dict/batch_obj;
listColumnInfos batch_dict/listColumnInfos;
diff --git a/skins/generic/main_template_macros.pt b/skins/generic/main_template_macros.pt
index ba60bc6..ae4b148 100644
--- a/skins/generic/main_template_macros.pt
+++ b/skins/generic/main_template_macros.pt
@@ -42,7 +42,7 @@ global specialCtxHeader options/specialCtxHeader|nothing"
<tr>
<td id="PortalLogo"><a href="#" tal:attributes="href string:${portal_url}?noajax=1; title portal_object/title_or_id"><img src="logo.gif" tal:define="logo here/logo.png" tal:attributes="src logo/absolute_url; alt portal_object/title_or_id; height logo/height; width logo/width" /></a></td>
<!-- nav_bar / search_form -->
- <td id="NavBar" align="right" i18n:domain="cmf_default"
+ <td id="NavBar" align="right" i18n:domain="plinn"
tal:condition="not:isAnon">
<form action="search" method="get" tal:attributes="action string:${portal_url}/search">
<table>
@@ -59,7 +59,7 @@ global specialCtxHeader options/specialCtxHeader|nothing"
<div id="user_menu_bar" metal:define-macro="user_menu_bar"
tal:define="uname python: (isAnon and [''] or [member.getMemberFullName(nameBefore=0)])[0]">
- <table id="MemberActionsBox" border="0" cellspacing="0" i18n:domain="cmf_default">
+ <table id="MemberActionsBox" border="0" cellspacing="0" i18n:domain="plinn">
<tr>
<td class="ActionTitle" tal:content="uname">Guest</td>
<td><img tal:attributes="src here/loading_progress.gif/absolute_url" width="82" height="7" id="loading_progress" alt="Loading progress..." i18n:attributes="alt" style="display:none" /></td>
diff --git a/skins/generic/search_form.pt b/skins/generic/search_form.pt
index d130798..ce15c5c 100644
--- a/skins/generic/search_form.pt
+++ b/skins/generic/search_form.pt
@@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body>
- <div metal:fill-slot="main_no_tabs" i18n:domain="cmf_default">
+ <div metal:fill-slot="main_no_tabs" i18n:domain="plinn">
<div class="Desktop">
<h1 i18n:translate="">Search inside <span tal:replace="here/Title"
i18n:name="title">portal</span></h1>
diff --git a/skins/generic/standard_error_message.pt b/skins/generic/standard_error_message.pt
index f90d3b5..b64b641 100644
--- a/skins/generic/standard_error_message.pt
+++ b/skins/generic/standard_error_message.pt
@@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
</head>
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
+<div metal:fill-slot="main" i18n:domain="plinn">
<div class="Desktop">
diff --git a/skins/generic/wf_macros.pt b/skins/generic/wf_macros.pt
index 0d7e245..0ec4f49 100644
--- a/skins/generic/wf_macros.pt
+++ b/skins/generic/wf_macros.pt
@@ -35,7 +35,7 @@
</tr>
</div>
</table>
- <em i18n:translate="" i18n:domain="cmf_default" tal:condition="not:review_history">This item has not had any status changes.</em>
+ <em i18n:translate="" i18n:domain="plinn" tal:condition="not:review_history">This item has not had any status changes.</em>
</div>
</body>
diff --git a/skins/photo_theme/main_template_macros.pt b/skins/photo_theme/main_template_macros.pt
index 71c04a0..56eb548 100644
--- a/skins/photo_theme/main_template_macros.pt
+++ b/skins/photo_theme/main_template_macros.pt
@@ -70,7 +70,7 @@ global specialCtxHeader options/specialCtxHeader|nothing"
<div tal:define="uname python: (isAnon and [''] or [member.getMemberFullName(nameBefore=0)])[0]" metal:define-macro="user_menu_bar">
- <table id="MemberActionsBox" border="0" cellspacing="0" i18n:domain="cmf_default">
+ <table id="MemberActionsBox" border="0" cellspacing="0" i18n:domain="plinn">
<tr>
<td class="ActionTitle" tal:content="uname">Guest</td>
<td><img tal:attributes="src here/loading_progress.gif/absolute_url" width="82" height="7" id="loading_progress" alt="Loading progress..." i18n:attributes="alt" style="display:none" /></td>
diff --git a/skins/photo_theme/photo_main_macros.pt b/skins/photo_theme/photo_main_macros.pt
index 3f021e5..e19c053 100644
--- a/skins/photo_theme/photo_main_macros.pt
+++ b/skins/photo_theme/photo_main_macros.pt
@@ -7,7 +7,7 @@
<div metal:define-macro="search_bar"
style="vertical-align:middle">
<form action="search" method="get" tal:attributes="action string:${portal_url}/search">
- <div id="quicksearch" i18n:domain="cmf_default">
+ <div id="quicksearch" i18n:domain="plinn">
<span i18n:translate="" tal:omit-tag="">Search</span>
<input name="SearchableText" type="text" size="16" />
<input name="portal_type:list" type="hidden" value="Photo" />
diff --git a/skins/photo_theme/search.pt b/skins/photo_theme/search.pt
index 8d90e1b..29f4194 100644
--- a/skins/photo_theme/search.pt
+++ b/skins/photo_theme/search.pt
@@ -8,7 +8,7 @@
</metal:block>
</head>
<body>
- <div metal:fill-slot="main_no_tabs" i18n:domain="cmf_default">
+ <div metal:fill-slot="main_no_tabs" i18n:domain="plinn">
<div class="Desktop">
<h2 i18n:translate="">Search Results</h2>