diff options
Diffstat (limited to 'ratatoeskr')
10 files changed, 66 insertions, 64 deletions
diff --git a/ratatoeskr/sys/translation.php b/ratatoeskr/sys/translation.php index cd40f85..ca43c13 100644 --- a/ratatoeskr/sys/translation.php +++ b/ratatoeskr/sys/translation.php @@ -10,6 +10,7 @@ */ require_once(dirname(__FILE__) . "/models.php"); +require_once(dirname(__FILE__) . "/utils.php"); require_once(dirname(__FILE__) . "/init_ste.php"); if(!defined(TRANSLATION_PLUGIN_LOADED)) @@ -21,7 +22,8 @@ if(!defined(TRANSLATION_PLUGIN_LOADED)) global $translation; if((!isset($translation)) or empty($params["for"]) or (!isset($translation[$params["for"]]))) return ""; - return $translation[$params["for"]]; + $rv = $translation[$params["for"]]; + return (!empty($params["raw"])) ? $rv : htmlesc($rv); } ); define(TRANSLATION_PLUGIN_LOADED, True); diff --git a/ratatoeskr/templates/src/systemtemplates/areyousure.html b/ratatoeskr/templates/src/systemtemplates/areyousure.html index 7159826..6663f7a 100644 --- a/ratatoeskr/templates/src/systemtemplates/areyousure.html +++ b/ratatoeskr/templates/src/systemtemplates/areyousure.html @@ -4,8 +4,8 @@ <h2><ste:escape>$question</ste:escape></h2> ?{$moredetails|<p><ste:escape>$moredetails</ste:escape></p>|} <form action="$callback" method="POST"> - <input type="submit" class="yes_btn" name="yes" value="<ste:escape>?{$yestext|$yestext|<ste:get_translation for='yes' />}</ste:escape>" /> - <input type="submit" class="no_btn" name="no" value="<ste:escape>?{$notext|$notext|<ste:get_translation for='no' />}</ste:escape>" /> + <input type="submit" class="yes_btn" name="yes" value="<ste:escape>?{$yestext|$yestext|<ste:get_translation for='yes' raw='y' />}</ste:escape>" /> + <input type="submit" class="no_btn" name="no" value="<ste:escape>?{$notext|$notext|<ste:get_translation for='no' raw='y' />}</ste:escape>" /> </form> </div> </ste:block> diff --git a/ratatoeskr/templates/src/systemtemplates/articles.html b/ratatoeskr/templates/src/systemtemplates/articles.html index 06b04ff..cb40fae 100644 --- a/ratatoeskr/templates/src/systemtemplates/articles.html +++ b/ratatoeskr/templates/src/systemtemplates/articles.html @@ -13,10 +13,10 @@ <form action="$rel_path_to_root/backend/content/articles" method="GET" accept-charset="UTF-8"> <div> - <strong><ste:escape><ste:get_translation for="filter" /></ste:escape>:</strong> - <ste:escape><ste:get_translation for="filter_urlname" /></ste:escape> <input type="text" name="filter_urlname" value="<ste:escape>$filter_urlname</ste:escape>" /> - <ste:escape><ste:get_translation for="filter_tag" /></ste:escape> <input type="text" name="filter_tag" value="<ste:escape>$filter_tag</ste:escape>" /> - <ste:escape><ste:get_translation for="filter_section" /></ste:escape> <input type="text" name="filter_section" value="<ste:escape>$filter_section</ste:escape>" /> + <strong><ste:get_translation for="filter" />:</strong> + <ste:get_translation for="filter_urlname" /> <input type="text" name="filter_urlname" value="<ste:escape>$filter_urlname</ste:escape>" /> + <ste:get_translation for="filter_tag" /> <input type="text" name="filter_tag" value="<ste:escape>$filter_tag</ste:escape>" /> + <ste:get_translation for="filter_section" /> <input type="text" name="filter_section" value="<ste:escape>$filter_section</ste:escape>" /> <input type="hidden" name="sort_$sorting[dir]" value="$sorting[by]" /> <input type="submit" /> </div> @@ -68,16 +68,16 @@ </ste:foreach> </ste:then> <ste:else> - <tr><td colspan="6" style="text-align: center;"><em><ste:escape><ste:get_translation for="no_articles" /></ste:escape></em></td></tr> + <tr><td colspan="6" style="text-align: center;"><em><ste:get_translation for="no_articles" /></em></td></tr> </ste:else> </ste:if> </tbody> </table> <div> - <input type="submit" name="delete" value="<ste:escape><ste:get_translation for='delete' /></ste:escape>" /> + <input type="submit" name="delete" value="<ste:get_translation for='delete' />" /> <select name="really_delete"> - <option value="no" selected="selected"><ste:escape><ste:get_translation for="notext_default" /></ste:escape></option> - <option value="yes"><ste:escape><ste:get_translation for="yestext_default" /></ste:escape></option> + <option value="no" selected="selected"><ste:get_translation for="notext_default" /></option> + <option value="yes"><ste:get_translation for="yestext_default" /></option> </select> </div> </form> diff --git a/ratatoeskr/templates/src/systemtemplates/backend_login.html b/ratatoeskr/templates/src/systemtemplates/backend_login.html index 5662221..73c2710 100755 --- a/ratatoeskr/templates/src/systemtemplates/backend_login.html +++ b/ratatoeskr/templates/src/systemtemplates/backend_login.html @@ -12,24 +12,24 @@ <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1)</div> <div class="vcenter_outer"><div class="vcenter_inner"> <div id="login_box"> - <h1><ste:escape><ste:get_translation for="login_form_header" /></ste:escape></h1> + <h1><ste:get_translation for="login_form_header" /></h1> <ste:if> $login_failed <ste:then> <div class="error"> - <ste:escape><ste:get_translation for="login_failed" /></ste:escape> + <ste:get_translation for="login_failed" /> </div> </ste:then> </ste:if> <form action="$rel_path_to_root/backend/login" method="POST" accept-charset="utf-8"> - <p><ste:escape><ste:capitalize><ste:get_translation for="username" /></ste:capitalize></ste:escape>: <input type="text" name="user" /></p> - <p><ste:escape><ste:capitalize><ste:get_translation for="password" /></ste:capitalize></ste:escape>: <input type="password" name="password" /></p> - <p class="loginbtn"><input type="submit" value="<ste:escape><ste:get_translation for='login_form_button' /></ste:escape>" /></p> + <p><ste:escape><ste:capitalize><ste:get_translation for="username" raw="y" /></ste:capitalize></ste:escape>: <input type="text" name="user" /></p> + <p><ste:escape><ste:capitalize><ste:get_translation for="password" raw="y" /></ste:capitalize></ste:escape>: <input type="password" name="password" /></p> + <p class="loginbtn"><input type="submit" value="<ste:get_translation for='login_form_button' />" /></p> </form> </div> </div></div> <div id="image_copyright"> - <ste:l10n_replace URL="http://en.wikipedia.org/wiki/File:Helkivad_ööpilved_Kuresoo_kohal.jpg" FILENAME="Helkivad ööpilved Kuresoo kohal.jpg" AUTHOR="Martin Koitmäe" LICENSE="<a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed.en\">CC BY-SA</a>"><ste:get_translation for="login_background_image" /></ste:l10n_replace> + <ste:l10n_replace URL="http://en.wikipedia.org/wiki/File:Helkivad_ööpilved_Kuresoo_kohal.jpg" FILENAME="Helkivad ööpilved Kuresoo kohal.jpg" AUTHOR="Martin Koitmäe" LICENSE="<a href=\"http://creativecommons.org/licenses/by-sa/3.0/deed.en\">CC BY-SA</a>"><ste:get_translation for="login_background_image" raw="y" /></ste:l10n_replace> </div> </div> </body> diff --git a/ratatoeskr/templates/src/systemtemplates/comments_list.html b/ratatoeskr/templates/src/systemtemplates/comments_list.html index 4d05db2..d19fca5 100644 --- a/ratatoeskr/templates/src/systemtemplates/comments_list.html +++ b/ratatoeskr/templates/src/systemtemplates/comments_list.html @@ -13,8 +13,8 @@ <form action="$rel_path_to_root/backend/content/comments" method="GET" accept-charset="UTF-8"> <div> - <strong><ste:escape><ste:get_translation for="filter" /></ste:escape>:</strong> - <ste:escape><ste:get_translation for="filter_article" /></ste:escape> <input type="text" name="filter_article" value="<ste:escape>$filter_article</ste:escape>" /> + <strong><ste:get_translation for="filter" />:</strong> + <ste:get_translation for="filter_article" /> <input type="text" name="filter_article" value="<ste:escape>$filter_article</ste:escape>" /> <input type="hidden" name="sort_$sorting[dir]" value="$sorting[by]" /> <input type="submit" /> </div> @@ -26,24 +26,24 @@ <tr> <th> </th> <th> - <ste:escape><ste:get_translation for="was_read" /></ste:escape> + <ste:get_translation for="was_read" /> <a href="$rel_path_to_root/backend/content/comments??{$filterquery|${filterquery}&|}sort_asc=was_read"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/sortarrow_up_?{$sort_asc_was_read|filled|outline}.png" alt="<ste:get_translation for='sort_asc' />" /></a> <a href="$rel_path_to_root/backend/content/comments??{$filterquery|${filterquery}&|}sort_desc=was_read"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/sortarrow_down_?{$sort_desc_was_read|filled|outline}.png" alt="<ste:get_translation for='sort_desc' />" /></a> </th> - <th><ste:escape><ste:get_translation for="visible" /></ste:escape></th> - <th><ste:escape><ste:get_translation for="comment_excerpt" /></ste:escape></th> + <th><ste:get_translation for="visible" /></th> + <th><ste:get_translation for="comment_excerpt" /></th> <th> - <ste:escape><ste:get_translation for="language" /></ste:escape> + <ste:get_translation for="language" /> <a href="$rel_path_to_root/backend/content/comments??{$filterquery|${filterquery}&|}sort_asc=language"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/sortarrow_up_?{$sort_asc_language|filled|outline}.png" alt="<ste:get_translation for='sort_asc' />" /></a> <a href="$rel_path_to_root/backend/content/comments??{$filterquery|${filterquery}&|}sort_desc=language"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/sortarrow_down_?{$sort_desc_language|filled|outline}.png" alt="<ste:get_translation for='sort_desc' />" /></a> </th> - <th><ste:escape><ste:get_translation for="author" /></ste:escape></th> + <th><ste:get_translation for="author" /></th> <th> - <ste:escape><ste:get_translation for="date_time" /></ste:escape> + <ste:get_translation for="date_time" /> <a href="$rel_path_to_root/backend/content/comments??{$filterquery|${filterquery}&|}sort_asc=date"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/sortarrow_up_?{$sort_asc_date|filled|outline}.png" alt="<ste:get_translation for='sort_asc' />" /></a> <a href="$rel_path_to_root/backend/content/comments??{$filterquery|${filterquery}&|}sort_desc=date"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/sortarrow_down_?{$sort_desc_date|filled|outline}.png" alt="<ste:get_translation for='sort_desc' />" /></a> </th> - <th><ste:escape><ste:get_translation for="article" /></ste:escape></th> + <th><ste:get_translation for="article" /></th> </tr> </thead> <tbody> @@ -55,7 +55,7 @@ <td><input type="checkbox" name="comment_multiselect[]" value="$comment[id]" /></td> <td>?{$comment[read_by_admin]|<ste:get_translation for="yes" />|<strong><ste:get_translation for="no" /></strong>}</td> <td>?{$comment[visible]|<ste:get_translation for="yes" />|<ste:get_translation for="no" />}</td> - <td><em><ste:escape>$comment[excerpt]</ste:escape>...</em> <a href="$rel_path_to_root/backend/content/comments/$comment[id]"><ste:escape><ste:get_translation for="read_more" /></ste:escape></a></td> + <td><em><ste:escape>$comment[excerpt]</ste:escape>...</em> <a href="$rel_path_to_root/backend/content/comments/$comment[id]"><ste:get_translation for="read_more" /></a></td> <td>$comment[language]</td> <td><ste:escape>$comment[author]</ste:escape></td> <td><ste:date timestamp="$comment[date]">%Y-%m-%d %H:%M:%S</ste:date></td> @@ -64,7 +64,7 @@ </ste:foreach> </ste:then> <ste:else> - <tr><td colspan="8" style="text-align: center"><em><ste:escape><ste:get_translation for="no_comments" /></ste:escape></em></td></tr> + <tr><td colspan="8" style="text-align: center"><em><ste:get_translation for="no_comments" /></em></td></tr> </ste:else> </ste:if> </tbody> @@ -72,11 +72,11 @@ <div> <select name="action_on_comments"> <option value="" selected="selected"></option> - <option value="mark_read"><ste:escape><ste:get_translation for="commentaction_mark_read" /></ste:escape></option> - <option value="mark_unread"><ste:escape><ste:get_translation for="commentaction_mark_unread" /></ste:escape></option> - <option value="make_visible"><ste:escape><ste:get_translation for="commentaction_make_visible" /></ste:escape></option> - <option value="make_invisible"><ste:escape><ste:get_translation for="commentaction_make_invisible" /></ste:escape></option> - <option value="delete"><ste:escape><ste:get_translation for="delete" /></ste:escape></option> + <option value="mark_read"><ste:get_translation for="commentaction_mark_read" /></option> + <option value="mark_unread"><ste:get_translation for="commentaction_mark_unread" /></option> + <option value="make_visible"><ste:get_translation for="commentaction_make_visible" /></option> + <option value="make_invisible"><ste:get_translation for="commentaction_make_invisible" /></option> + <option value="delete"><ste:get_translation for="delete" /></option> </select> <input type="submit" /> </div> diff --git a/ratatoeskr/templates/src/systemtemplates/image_embed.html b/ratatoeskr/templates/src/systemtemplates/image_embed.html index 387dbaa..d8a3444 100644 --- a/ratatoeskr/templates/src/systemtemplates/image_embed.html +++ b/ratatoeskr/templates/src/systemtemplates/image_embed.html @@ -3,11 +3,11 @@ <div class="pos_center"> <ste:if>$embed_code <ste:then> - <p><strong><ste:escape><ste:get_translation for="embed_code" /></ste:escape>:</strong> <code><ste:escape>$embed_code</ste:escape></code></p> + <p><strong><ste:get_translation for="embed_code" />:</strong> <code>$embed_code</code></p> </ste:then> </ste:if> <form action="$rel_path_to_root/backend/content/images/$image_id/$markup_variant" method="POST"> - <p><strong><ste:escape><ste:get_translation for="image_alt" /></ste:escape>:</strong> <input type="text" name="img_alt" /></p> + <p><strong><ste:get_translation for="image_alt" />:</strong> <input type="text" name="img_alt" /></p> <p><input type="submit" /></p> </form> </div> diff --git a/ratatoeskr/templates/src/systemtemplates/image_list.html b/ratatoeskr/templates/src/systemtemplates/image_list.html index 74bab9e..81cbc41 100644 --- a/ratatoeskr/templates/src/systemtemplates/image_list.html +++ b/ratatoeskr/templates/src/systemtemplates/image_list.html @@ -14,12 +14,12 @@ <div class="dualcolumns"> <div class="column_left"> <form action="$rel_path_to_root/backend/content/images" method="POST" accept-charset="UTF-8" enctype="multipart/form-data"> - <h2><ste:escape><ste:get_translation for="image_upload" /></ste:escape></h2> + <h2><ste:get_translation for="image_upload" /></h2> <p><input type="file" name="upload_img" class="fullwidth" /></p> <p> - <strong><ste:escape><ste:get_translation for="img_upload_name" /></ste:escape></strong><br /> + <strong><ste:get_translation for="img_upload_name" /></strong><br /> <input type="text" name="upload_name" class="fullwidth" /><br /> - <ste:escape><ste:get_translation for="img_upload_name_leave_empty" /></ste:escape> + <ste:get_translation for="img_upload_name_leave_empty" /> </p> <p><input type="submit" name="upload" /></p> </form> @@ -29,9 +29,9 @@ <table class="fullwidth listtab"> <thead><tr> <th> </th> - <th><ste:escape><ste:get_translation for="image_preview" /></ste:escape></th> - <th><ste:escape><ste:get_translation for="image_name" /></ste:escape></th> - <th><ste:escape><ste:get_translation for="image_getmarkup" /></ste:escape></th> + <th><ste:get_translation for="image_preview" /></th> + <th><ste:get_translation for="image_name" /></th> + <th><ste:get_translation for="image_getmarkup" /></th> </tr></thead> <tbody> <ste:set var="images_n"><ste:arraylen array="images" /></ste:set> @@ -49,16 +49,16 @@ </ste:foreach> </ste:then> <ste:else> - <tr><td colspan="5" style="text-align: center;"><em><ste:escape><ste:get_translation for="no_images" /></ste:escape></em></td></tr> + <tr><td colspan="5" style="text-align: center;"><em><ste:get_translation for="no_images" /></em></td></tr> </ste:else> </ste:if> </tbody> </table> <div> - <input type="submit" name="delete" value="<ste:escape><ste:get_translation for='delete' /></ste:escape>" /> + <input type="submit" name="delete" value="<ste:get_translation for='delete' />" /> <select name="really_delete"> - <option value="no" selected="selected"><ste:escape><ste:get_translation for="notext_default" /></ste:escape></option> - <option value="yes"><ste:escape><ste:get_translation for="yestext_default" /></ste:escape></option> + <option value="no" selected="selected"><ste:get_translation for="notext_default" /></option> + <option value="yes"><ste:get_translation for="yestext_default" /></option> </select> </div> </form> diff --git a/ratatoeskr/templates/src/systemtemplates/single_comment.html b/ratatoeskr/templates/src/systemtemplates/single_comment.html index e53ced3..81b209a 100644 --- a/ratatoeskr/templates/src/systemtemplates/single_comment.html +++ b/ratatoeskr/templates/src/systemtemplates/single_comment.html @@ -13,49 +13,49 @@ <div class="triplecolumns"> <div class="column_left"> - <h2><ste:escape><ste:get_translation for="comment_perform_action" /></ste:escape></h2> + <h2><ste:get_translation for="comment_perform_action" /></h2> <form action="$rel_path_to_root/backend/content/comments/$id" method="POST"> <select name="action_on_comment"> <option value="" selected="selected"></option> - <option value="make_visible"><ste:escape><ste:get_translation for="commentaction_make_visible" /></ste:escape></option> - <option value="make_invisible"><ste:escape><ste:get_translation for="commentaction_make_invisible" /></ste:escape></option> - <option value="delete"><ste:escape><ste:get_translation for="delete" /></ste:escape></option> + <option value="make_visible"><ste:get_translation for="commentaction_make_visible" /></option> + <option value="make_invisible"><ste:get_translation for="commentaction_make_invisible" /></option> + <option value="delete"><ste:get_translation for="delete" /></option> </select> <input type="submit" /> </form> </div> <div class="column_right"> <p> - <strong><ste:escape><ste:get_translation for="author" /></ste:escape></strong><br /> + <strong><ste:get_translation for="author" /></strong><br /> <ste:escape>$author</ste:escape> </p> <p> - <strong><ste:escape><ste:get_translation for="visible" /></ste:escape></strong><br /> + <strong><ste:get_translation for="visible" /></strong><br /> ?{$visible|<ste:get_translation for="yes" />|<ste:get_translation for="no" />} </p> <p> - <strong><ste:escape><ste:get_translation for="date_time" /></ste:escape></strong><br /> + <strong><ste:get_translation for="date_time" /></strong><br /> <ste:date timestamp="$date">%Y-%m-%d %H:%M:%S</ste:date> </p> <p> - <strong><ste:escape><ste:get_translation for="article" /></ste:escape></strong><br /> + <strong><ste:get_translation for="article" /></strong><br /> <a href="$rel_path_to_root/backend/content/write/<ste:escape>$article</ste:escape>"><ste:escape>$article</ste:escape></a> </p> <p> - <strong><ste:escape><ste:get_translation for="language" /></ste:escape></strong><br /> + <strong><ste:get_translation for="language" /></strong><br /> $language </p> </div> <div class="column_main"> - <h2><ste:escape><ste:get_translation for="comment_text" /></ste:escape></h2> + <h2><ste:get_translation for="comment_text" /></h2> $comment_text <hr /> - <h2><ste:escape><ste:get_translation for="comment_text_raw" /></ste:escape></h2> - <pre><code><ste:escape>$comment_raw</ste:escape></code></pre> + <h2><ste:get_translation for="comment_text_raw" /></h2> + <code><pre>$comment_raw</pre></code> </div> </div> <div class="triplecolumns_stop"></div> diff --git a/ratatoeskr/templates/src/systemtemplates/tag_deleted.html b/ratatoeskr/templates/src/systemtemplates/tag_deleted.html index 641b06c..c02db7b 100644 --- a/ratatoeskr/templates/src/systemtemplates/tag_deleted.html +++ b/ratatoeskr/templates/src/systemtemplates/tag_deleted.html @@ -1,7 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> <div class="success"> - <ste:escape><ste:get_translation for="tag_deleted" /></ste:escape><br /> - <a href="$rel_path_to_root/backend/content/tags"><ste:escape><ste:get_translation for="back_to_tags" /></ste:escape></a> + <ste:get_translation for="tag_deleted" /><br /> + <a href="$rel_path_to_root/backend/content/tags"><ste:get_translation for="back_to_tags" /></a> </div> </ste:block> diff --git a/ratatoeskr/templates/src/systemtemplates/tags_overview.html b/ratatoeskr/templates/src/systemtemplates/tags_overview.html index 7d2ecc0..b58ddeb 100644 --- a/ratatoeskr/templates/src/systemtemplates/tags_overview.html +++ b/ratatoeskr/templates/src/systemtemplates/tags_overview.html @@ -15,12 +15,12 @@ <table class="listtab"> <thead> <tr> - <th><ste:escape><ste:get_translation for="tag_name" /></ste:escape></th> - <th><ste:escape><ste:get_translation for="delete" /></ste:escape></th> + <th><ste:get_translation for="tag_name" /></th> + <th><ste:get_translation for="delete" /></th> <ste:foreach array="all_tag_langs" key="langcode" value="langname"> <th>($langcode) <ste:escape>$langname</ste:escape></th> </ste:foreach> - <th><ste:escape><ste:get_translation for="tag_add_lang" /></ste:escape></th> + <th><ste:get_translation for="tag_add_lang" /></th> </tr> </thead> <tbody> @@ -36,7 +36,7 @@ </td> </ste:foreach> <td> - <a href="$rel_path_to_root/backend/content/tags/$tagdata[name]/addtranslation"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/add.png" alt="<ste:escape><ste:get_translation for='tag_add_lang' /></ste:escape>" /></a> + <a href="$rel_path_to_root/backend/content/tags/$tagdata[name]/addtranslation"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/add.png" alt="<ste:get_translation for='tag_add_lang' />" /></a> </td> </tr> </ste:foreach> @@ -48,7 +48,7 @@ <div> <h2><ste:get_translation for="create_new_tag" /></h2> <form action="$rel_path_to_root/backend/content/tags" method="POST" accept-charset="UTF-8"> - <p><ste:escape><ste:get_translation for="new_tag_name" /></ste:escape>: <input type="text" name="new_tag_name" /></p> + <p><ste:get_translation for="new_tag_name" />: <input type="text" name="new_tag_name" /></p> <p><input type="submit" name="create_new_tag" /></p> </form> </div> |