Commit 086b3a85 authored by xavidp's avatar xavidp

[FIX]Prevent fatal errors coming from regression bugs when using Tiki with for...

[FIX]Prevent fatal errors coming from regression bugs when using Tiki with for non-English languages (which eventually use single quote in translated strings, like Dutch, French, Catalan and such). Thanks evliempt for raising the issue through your report in the forums (Re: https://tiki.org/forumthread57881 ).
parent e6ecd6dc
......@@ -302,7 +302,7 @@
{preference name='fgal_viewerjs_uri'}
{if $viewerjs_err}
<div class="col-sm-8 pull-right">
{remarksbox type='errors' title='{tr}Warning{/tr}'}{$viewerjs_err}{/remarksbox}
{remarksbox type='errors' title="{tr}Warning{/tr}"}{$viewerjs_err}{/remarksbox}
</div>
{/if}
</div>
......
......@@ -64,7 +64,7 @@
{$kcwText}
<div class="adminoptionbox">
{tr}You can manually edit these values in lib/videogals/standardTikiKcw.xml{/tr}<br>
{tr}Recreate KCW "uiConf"{/tr} {button _text='{tr}Update{/tr}' kcw_rebuild=1 _keepall='y' _auto_args='*'}
{tr}Recreate KCW "uiConf"{/tr} {button _text="{tr}Update{/tr}" kcw_rebuild=1 _keepall='y' _auto_args='*'}
</div>
</fieldset>
......
......@@ -37,13 +37,9 @@
<div class="row">
<div class="form-group col-lg-12 clearfix">
<a role="link" class="btn btn-link" href="tiki-listpages.php" title="{tr}List{/tr}">
{icon name="admin_wiki"} {tr}List pages{/tr}
</a>
{button _icon_name='admin_wiki' _text="{tr}Pages{/tr}" class='btn btn-link' _script='tiki-listpages.php' _title="{tr}List wiki pages{/tr}"}
{if $prefs.feature_wiki_structure eq "y" and $tiki_p_view eq "y"}
<a role="link" class="btn btn-link" href="tiki-admin_structures.php" title="{tr}List{/tr}">
{icon name="structure"} {tr}List structures{/tr}
</a>
{button _icon_name='structure' _text="{tr}Structures{/tr}" class='btn btn-link' _script='tiki-admin_structures.php' _title="{tr}List structures{/tr}"}
{/if}
<div class="pull-right">
<input type="submit" class="btn btn-primary btn-sm" name="wikisetprefs" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}" />
......
......@@ -53,7 +53,7 @@
{/if}
</div>
{if $captchalib->type eq 'default'}
{button _id='captchaRegenerate' _class='' href='#antibot' _text='{tr}Try another code{/tr}' _icon_name="refresh" _onclick="generateCaptcha();return false;"}
{button _id='captchaRegenerate' _class='' href='#antibot' _text="{tr}Try another code{/tr}" _icon_name="refresh" _onclick="generateCaptcha();return false;"}
{/if}
</div>
{/if}
......
......@@ -2,12 +2,12 @@
<ul class="pager">
{if $post_info.adjacent.prev}
<li class="previous">
{self_link _script=$post_info.adjacent.prev.postId|sefurl:blogpost _title='{tr}Previous post{/tr}' _noauto='y'}&larr; {$post_info.adjacent.prev.title|truncate}{/self_link}
{self_link _script=$post_info.adjacent.prev.postId|sefurl:blogpost _title="{tr}Previous post{/tr}" _noauto='y'}&larr; {$post_info.adjacent.prev.title|truncate}{/self_link}
</li>
{/if}
{if $post_info.adjacent.next}
<li class="next">
{self_link _script=$post_info.adjacent.next.postId|sefurl:blogpost _title='{tr}Next post{/tr}' _noauto='y'}{$post_info.adjacent.next.title|truncate} &rarr;{/self_link}
{self_link _script=$post_info.adjacent.next.postId|sefurl:blogpost _title="{tr}Next post{/tr}" _noauto='y'}{$post_info.adjacent.next.title|truncate} &rarr;{/self_link}
</li>
{/if}
</ul>
......
......@@ -32,7 +32,7 @@
<form action="messu-compose.php" method="post" class="form-horizontal" role="form">
<div class="form-group">
<label class="col-sm-2 control-label" for="mess-composeto">{tr}To{/tr}
{help url="Inter-User+Messages#Composing_messages" desc='{tr}To: Multiple addresses can be separated with semicolons (";") or commas (","){/tr}'}
{help url="Inter-User+Messages#Composing_messages" desc="{tr}To: Multiple addresses can be separated with semicolons (;) or commas (,){/tr}"}
</label>
<div class="col-sm-10">
<input type="text" class="username form-control" name="to" id="mess-composeto" value="{$to|escape}">
......@@ -42,7 +42,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="mess-composecc">{tr}CC{/tr}
{help url="Inter-User+Messages#Composing_messages" desc='{tr}CC: Multiple addresses can be separated with semicolons (";") or commas (","){/tr}'}
{help url="Inter-User+Messages#Composing_messages" desc="{tr}CC: Multiple addresses can be separated with semicolons (;) or commas (,){/tr}"}
</label>
<div class="col-sm-10">
<input type="text" class="username form-control" name="cc" id="mess-composecc" value="{$cc|escape}">
......@@ -50,7 +50,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="mess-composebcc">{tr}BCC{/tr}
{help url="Inter-User+Messages#Composing_messages" desc='{tr}BCC: Multiple addresses can be separated with semicolons (";") or commas (","){/tr}'}
{help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC: Multiple addresses can be separated with semicolons (;) or commas (,){/tr}"}
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="bcc" id="mess-composebcc" value="{$bcc|escape}" class="username">
......
......@@ -50,7 +50,7 @@ var account='';
{if $tiki_p_account_manage=='y'}
<tr><td colspan="2"><a href="tiki-accounting_account.php?bookId={$bookId}&action=new">{tr}Create account{/tr}</a></td></tr>{/if}
{foreach from=$accounts item=a}
<tr class="{cycle values="odd,even"} tips" {popup caption='{tr}Notes{/tr}' text=$a.accountNotes}>
<tr class="{cycle values="odd,even"} tips" {popup caption="{tr}Notes{/tr}" text=$a.accountNotes}>
<td class="accompactlist">
{if $tiki_p_account_manage=='y'}
<a href="tiki-accounting_account.php?bookId={$bookId}&action=edit&accountId={$a.accountId}"><img src="img/icons/edit.gif" alt="edit" border="0"></a>
......
......@@ -52,7 +52,7 @@ var account='';
<tr><td colspan="2"><a href="tiki-accounting_account.php?bookId={$bookId}&action=new">{tr}Create account{/tr}</a></td></tr>
{/if}
{foreach from=$accounts item=a}
<tr class="{cycle values="odd,even"} tips" {popup caption='{tr}Notes{/tr}' text=$a.accountNotes}>
<tr class="{cycle values="odd,even"} tips" {popup caption="{tr}Notes{/tr}" text=$a.accountNotes}>
<td class="accompactlist">
{if $tiki_p_account_manage=='y'}
<a href="tiki-accounting_account.php?bookId={$bookId}&action=edit&accountId={$a.accountId}"><img src="img/icons/edit.gif" alt="edit" border="0"></a>
......
......@@ -439,7 +439,7 @@
<option value="{$k|escape}" {$i}>{$k|escape}</option>{/foreach}
</select>
{if $option_groups|@count ge '2'}
{if $prefs.jquery_ui_chosen neq 'y'}{$ctrlMsg='{tr}Use Ctrl+Click to select multiple options{/tr}<br>'}{/if}
{if $prefs.jquery_ui_chosen neq 'y'}{$ctrlMsg="{tr}Use Ctrl+Click to select multiple options{/tr}<br>"}{/if}
{remarksbox type="tip" title="{tr}Tip{/tr}"}{$ctrlMsg}{tr}Selecting 2 groups means that the option will be seen if the user belongs to the 2 groups. If you want the 2 groups to see the option, create 2 options with one group each.{/tr}
<br>
{tr}If the url is ((PageName)), you do not need to put the groups, the option will be displayed only if the page can be displayed.{/tr}{/remarksbox}
......
......@@ -23,7 +23,7 @@
{tabset name="admin_rssmodules"}
{tab name='{tr}External Feeds{/tr}'}
{tab name="{tr}External Feeds{/tr}"}
<h2>{tr}External Feeds{/tr}</h2>
<div align="center">
{if $channels or ($find ne '')}
......
......@@ -177,7 +177,7 @@
</div>
</div>
<div class="clearfix">
{remarksbox title='{tr}Tips{/tr}'}
{remarksbox title="{tr}Tips{/tr}"}
{tr}To configure the toolbars on the various text editing areas select the section, and optionally check the comments checkbox, you want to edit and drag the icons from the left hand box to the toolbars on the right.<br>
Drag icons back from the toolbar rows onto the full list to remove them.<br>
Icons with <strong>bold</strong> labels are for wiki text areas, those that are <em>italic</em> are for WYSIWYG mode, and those that are <strong><em>bold and italic</em></strong> are for both.<br>
......
......@@ -36,7 +36,7 @@
href="tiki-calendar_edit_item.php?viewcalitemId={$event.calitemId}"
{/if}
{/if}
title='{tr}Details{/tr}'>{icon name='info'}
title="{tr}Details{/tr}">{icon name='info'}
</a>
</span>
{if $myurl eq "tiki-action_calendar.php"}
......
......@@ -31,7 +31,7 @@
{/if}
{if $prefs.calendar_fullcalendar neq 'y' or not $edit}
{if $prefs.calendar_export_item == 'y' and $tiki_p_view_calendar eq 'y'}
{button href='tiki-calendar_export_ical.php? export=y&calendarItem='|cat:$id _icon_name="export" _text='{tr}Export Event as iCal{/tr}'}
{button href='tiki-calendar_export_ical.php? export=y&calendarItem='|cat:$id _icon_name="export" _text="{tr}Export Event as iCal{/tr}'}
{/if}
{/if}
</div>
......@@ -865,7 +865,7 @@ $(".end.time select, #end").change(function () {
{/if}
{if $prefs.calendar_fullcalendar eq 'y'}
{if $prefs.calendar_export_item == 'y'}
{button href='tiki-calendar_export_ical.php? export=y&calendarItem='|cat:$id _text='{tr}Export Event as iCal{/tr}'}
{button href='tiki-calendar_export_ical.php? export=y&calendarItem='|cat:$id _text="{tr}Export Event as iCal{/tr}'}
{/if}
{/if}
<input type="submit" class="btn btn-default" onclick="needToConfirm=false;document.location='{$referer|escape:'html'}';return false;" value="{tr}Cancel{/tr}">
......
......@@ -78,7 +78,7 @@
href="tiki-calendar_edit_item.php?viewcalitemId={$event.calitemId}"
{/if}
{/if}
title='{tr}Details{/tr}'>{icon name='info'}
title="{tr}Details{/tr}">{icon name='info'}
</a>
</span>
<abbr class="dtstart" title="{if $event.result.allday eq '1'}{tr}All day{/tr}{else}{$event.startTimeStamp|isodate}{/if}" style="{if $event.status eq '2'}text-decoration:line-through;{/if}{if isset($infocals.$cellcalendarId.customfgcolor)}color:#{$infocals.$cellcalendarId.customfgcolor};{/if}">
......
......@@ -48,14 +48,14 @@
<td><input name='Taxable[]' class='InvoiceTaxable' type='checkbox' value='y' {if $invoiceItem.Taxable eq 'y'} checked='true' {/if}></td>
<td><input name='Amount[]' class='InvoiceAmount' type='text' value='{$invoiceItem.Amount}'></td>
<td>
<input type='button' class='DeleteItem' value='{tr}Delete{/tr}'>
<input type='button' class='DeleteItem' value="{tr}Delete{/tr}">
</td>
</tr>
{/foreach}
<tr>
<td colspan='4'>
<input type='button' value='{tr}New Item{/tr}' id='InvoiceNewItem'>
<input type='button' value="{tr}New Item{/tr}" id='InvoiceNewItem'>
</td>
</tr>
......@@ -69,4 +69,4 @@
<textarea name="InvoiceNote" id="InvoiceNote">{$invoice.$InvoiceNote}</textarea>
<br>
<input type="submit" class="btn btn-default btn-sm" value="{tr}Save Invoice{/tr}" name="submit">
</form>
\ No newline at end of file
</form>
......@@ -553,7 +553,7 @@
<legend>{tr}General{/tr} <a href="https://doc.tiki.org/general+admin" target="_blank" title="{tr}Help{/tr}">{icon name="help"}</a></legend>
<div style="padding:5px; clear:both">
<label for="browsertitle">{tr}Browser title:{/tr}</label>
<div style="margin-left:1em"><input class="form-control" type="text" size="40" name="browsertitle" id="browsertitle" onclick="if (this.value=='{tr}My Tiki{/tr}') this.value='';" onfocus="origval=this.value;" onblur="if (this.value=='') this.value=origval;" value="{if $prefs.browsertitle eq ''}{tr}My Tiki{/tr}{else}{$prefs.browsertitle|escape}{/if}">
<div style="margin-left:1em"><input class="form-control" type="text" size="40" name="browsertitle" id="browsertitle" onclick="if (this.value=="{tr}My Tiki{/tr}") this.value='';" onfocus="origval=this.value;" onblur="if (this.value=='') this.value=origval;" value="{if $prefs.browsertitle eq ''}{tr}My Tiki{/tr}{else}{$prefs.browsertitle|escape}{/if}">
<br><em>{tr}This will appear in the browser title bar.{/tr}</em>
</div>
</div>
......@@ -745,7 +745,7 @@
{if $double_encode_fix_attempted eq 'y'}
<p>{tr}You can now access the site normally. Report back any issues that you might find (if any) to the Tiki forums or bug tracker{/tr}</p>
{elseif not isset($legacy_collation)}
<form method="post" action="#" onsubmit="return confirm('{tr}Are you sure you want to attempt to fix the encoding of your entire database?{/tr}');" style="padding-top: 100px;">
<form method="post" action="#" onsubmit="return confirm("{tr}Are you sure you want to attempt to fix the encoding of your entire database?{/tr}");" style="padding-top: 100px;">
<fieldset>
<legend>{tr}Upgrading and running into encoding issues?{/tr}</legend>
<p>{tr}We can try to fix it, but <strong>make sure you have backups, and can restore them</strong>.{/tr}</p>
......
......@@ -21,7 +21,7 @@
<td class="text">{$item->userId}</td>
<td class="text">{$item->tags}</td>
{include file='tiki-list_kaltura_entries_add_info.tpl'}
<td class="text"><a href="#" title="{tr}Information{/tr}" {popup trigger="onmouseover" fullhtml="1" sticky=true text=$smarty.capture.add_info|escape:"javascript"|escape:"html" left=true}>{icon name='information' class='' title='{tr}More Information{/tr}'}</a><a href="#" title="{tr}Actions{/tr}" {popup delay="0|2000" fullhtml="1" text=$smarty.capture.actions|escape:"javascript"|escape:"html"}>{icon name='wrench' class='' title='{tr}Actions{/tr}'}</a></td>
<td class="text"><a href="#" title="{tr}Information{/tr}" {popup trigger="onmouseover" fullhtml="1" sticky=true text=$smarty.capture.add_info|escape:"javascript"|escape:"html" left=true}>{icon name='information' class='' title="{tr}More Information{/tr}"}</a><a href="#" title="{tr}Actions{/tr}" {popup delay="0|2000" fullhtml="1" text=$smarty.capture.actions|escape:"javascript"|escape:"html"}>{icon name='wrench' class='' title="{tr}Actions{/tr}"}</a></td>
</tr>
{/if}
{/foreach}
......
......@@ -130,7 +130,7 @@
<div class="col-sm-6 pull-left" style="margin-bottom: 10px">
<div class="input-group input-group-sm">
<span class="input-group-addon">
{icon name='admin_i18n' class='tips' title=':{tr}Translation{/tr}'}
{icon name='admin_i18n' class='tips' title=':{tr}Translation{/tr}"}
</span>
<select name="tra_lang" class="form-control">
{section name=ix loop=$languages}
......@@ -143,9 +143,9 @@
<div class="input-group-btn">
{if $show_translation_history}
<input type="hidden" name="show_translation_history" value="1">
{button show_translation_history=0 _text='{tr}Hide translation history{/tr}' _auto_args="*" _class="btn btn-default btn-sm"}
{button show_translation_history=0 _text="{tr}Hide translation history{/tr}" _auto_args="*" _class="btn btn-default btn-sm"}
{else}
{button show_translation_history=1 _text='{tr}Show translation history{/tr}' _auto_args="*" _class="btn btn-default btn-sm"}
{button show_translation_history=1 _text="{tr}Show translation history{/tr}" _auto_args="*" _class="btn btn-default btn-sm"}
{/if}
</div>
</div>
......@@ -278,7 +278,7 @@
{tr}Version{/tr}
</th>
<th>
{icon name="html" iclass="tips" ititle='{tr}HTML allowed{/tr}:{tr}HTML syntax is allowed either by page setting or use of the WYSIWIG editor{/tr}'}
{icon name="html" iclass="tips" ititle="{tr}HTML allowed{/tr}:{tr}HTML syntax is allowed either by page setting or use of the WYSIWIG editor{/tr}"}
</th>
<th></th>
{if $prefs.default_wiki_diff_style != "old" and $history}
......@@ -332,7 +332,7 @@
</td>
<td class="button_container">
{if $info.is_html || $info.wysiwyg eq "y"}
{icon name='html' iclass='tips' ititle=':{tr}HTML allowed{/tr}'}
{icon name='html' iclass='tips' ititle=':{tr}HTML allowed{/tr}"}
{/if}
</td>
<td class="button_container" style="white-space: nowrap">
......@@ -428,7 +428,7 @@
</td>
<td class="button_container">
{if $element.is_html eq "1"}
{icon name='html' iclass='tips' ititle=':{tr}HTML allowed{/tr}'}
{icon name='html' iclass='tips' ititle=':{tr}HTML allowed{/tr}"}
{/if}
</td>
<td class="button_container" style="white-space: nowrap">
......
......@@ -221,7 +221,7 @@
</option>
{/section}
</select>
{button _text='{tr}Admin templates{/tr}' href='tiki-admin_content_templates.php' _target='blank'}
{button _text="{tr}Admin templates{/tr}" href='tiki-admin_content_templates.php' _target='blank'}
</div>
</div>
{/if}
......
......@@ -123,9 +123,9 @@
</div>
<div class="navbar">
{if $pageCount gt 0}
{button _text='{tr}Previous{/tr}' _class='btn-sm btn-prev'}
{button _text="{tr}Previous{/tr}" _class='btn-sm btn-prev'}
{tr}Page{/tr} <span class="pageNum">0</span> / <span class="pageCount">0</span>
{button _text='{tr}Next{/tr}' _class='btn-sm btn-next'}
{button _text="{tr}Next{/tr}" _class='btn-sm btn-next'}
{/if}
<input type="submit" class="btn btn-default btn-sm submit" value="{tr}Send Answers{/tr}" name="ans">
</div>
......
......@@ -457,7 +457,7 @@
{/if}
<div class="form-group">
{tr}Reset remark boxes visibility{/tr}&nbsp;&nbsp;
{button _text='{tr}Reset{/tr}' _onclick="if (confirm('{tr}This will reset the visibility of all the tips, notices and warning remarks boxes you have closed.{/tr}')) {ldelim}deleteCookie('rbox');{rdelim}return false;"}
{button _text="{tr}Reset{/tr}" _onclick="if (confirm('{tr}This will reset the visibility of all the tips, notices and warning remarks boxes you have closed.{/tr}')) {ldelim}deleteCookie('rbox');{rdelim}return false;"}
</div>
<div><input type="submit" class="btn btn-primary" name="new_prefs" value="{tr}Save changes{/tr}"></div>
......
......@@ -6,12 +6,12 @@
{block name="content"}
{if $errMsg}
{remarksbox title='{tr}Vimeo Setup Error{/tr}' type='error'}
{remarksbox title="{tr}Vimeo Setup Error{/tr}" type='error'}
<p>{$errMsg}</p>
{/remarksbox}
{$disabled=true}
{else}
{remarksbox title='{tr}Vimeo Info{/tr}' type='info'}
{remarksbox title="{tr}Vimeo Info{/tr}" type='info'}
<p>{tr _0=$availableMB}Available space: %0 megabytes{/tr}</p>
{if $availableSD eq '0'}<p>{tr}No standard definition uploads available currently{/tr}</p>{/if}
{if $availableHD eq '0'}<p>{tr}No high definition uploads available currently{/tr}</p>{/if}
......
......@@ -296,7 +296,7 @@
<tr>
<td>{tr}Reset remark boxes visibility{/tr}</td>
<td>
{button _text='{tr}Reset{/tr}' _onclick="if (confirm('{tr}This will reset the visibility of all the tips, notices and warning remarks boxes you have closed.{/tr}')) {ldelim}deleteCookie('rbox');{rdelim}return false;"}
{button _text="{tr}Reset{/tr}" _onclick="if (confirm('{tr}This will reset the visibility of all the tips, notices and warning remarks boxes you have closed.{/tr}')) {ldelim}deleteCookie('rbox');{rdelim}return false;"}
</td>
</tr>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment