Skip to content

Commit

Permalink
updates some view templates which were using gt() php call instead of…
Browse files Browse the repository at this point in the history
… |gettext
  • Loading branch information
dleffler committed Aug 20, 2016
1 parent 6881c51 commit 907082e
Show file tree
Hide file tree
Showing 21 changed files with 39 additions and 39 deletions.
Expand Up @@ -110,13 +110,13 @@
{/group}
{if function_exists('ldap_connect')}
{group label="LDAP Authentication"|gettext}
{control type="checkbox" postfalse=1 name="sc[USE_LDAP]" id=use_ldap label="Turn on LDAP Authentication?"|gettext checked=$smarty.const.USE_LDAP value=1 description=gt('Checking this option will cause Exponent to try to authenticate to the ldap server listed below.')}
{control type="checkbox" postfalse=1 name="sc[USE_LDAP]" id=use_ldap label="Turn on LDAP Authentication?"|gettext checked=$smarty.const.USE_LDAP value=1 description='Checking this option will cause Exponent to try to authenticate to the ldap server listed below.'|gettext}
<span id="ldap">
{control type="text" name="sc[LDAP_SERVER]" label="LDAP Server"|gettext value=$smarty.const.LDAP_SERVER description=gt('Enter the hostname or IP of the LDAP server.')}
{control type="text" name="sc[LDAP_BASE_CONTEXT]" label="Base Context"|gettext value=$smarty.const.LDAP_BASE_CONTEXT description=gt('Enter the Base Context for this LDAP connection. (e.g., ou=users, dc=mycompanysite, dc=local)')}
{control type="text" name="sc[LDAP_BASE_DN]" label="Base Domain"|gettext value=$smarty.const.LDAP_BASE_DN description=gt('Enter the Base Domain for this LDAP connection. (e.g., mycompanysite.local)')}
{control type="text" name="sc[LDAP_BIND_USER]" label="LDAP Bind User"|gettext value=$smarty.const.LDAP_BIND_USER description=gt('The username or context for the binding to the LDAP Server to perform administration tasks.')}
{control type="password" name="sc[LDAP_BIND_PASS]" label="LDAP Bind Password"|gettext value=$smarty.const.LDAP_BIND_PASS description=gt('Enter the password for the username/context listed above.')}
{control type="text" name="sc[LDAP_SERVER]" label="LDAP Server"|gettext value=$smarty.const.LDAP_SERVER description='Enter the hostname or IP of the LDAP server.'|gettext}
{control type="text" name="sc[LDAP_BASE_CONTEXT]" label="Base Context"|gettext value=$smarty.const.LDAP_BASE_CONTEXT description='Enter the Base Context for this LDAP connection. (e.g., ou=users, dc=mycompanysite, dc=local)'|gettext}
{control type="text" name="sc[LDAP_BASE_DN]" label="Base Domain"|gettext value=$smarty.const.LDAP_BASE_DN description='Enter the Base Domain for this LDAP connection. (e.g., mycompanysite.local)'|gettext}
{control type="text" name="sc[LDAP_BIND_USER]" label="LDAP Bind User"|gettext value=$smarty.const.LDAP_BIND_USER description='The username or context for the binding to the LDAP Server to perform administration tasks.'|gettext}
{control type="password" name="sc[LDAP_BIND_PASS]" label="LDAP Bind Password"|gettext value=$smarty.const.LDAP_BIND_PASS description='Enter the password for the username/context listed above.'|gettext}
</span>
{/group}
{/if}
Expand Down Expand Up @@ -172,9 +172,9 @@
{control type="dropdown" name="sc[SITE_FILE_MANAGER]" label="File Manager"|gettext items="Traditional,elFinder"|gettxtlist values="picker,elfinder" default=$smarty.const.SITE_FILE_MANAGER}
{control type="dropdown" name="sc[ELFINDER_THEME]" label="elFinder Theme"|gettext items=$elf_themes default=$smarty.const.ELFINDER_THEME}
{control type="text" name="sc[FM_WIDTH]" label="Popup Window Width"|gettext value=$smarty.const.FM_WIDTH|default:1024 size="4"}
{control type="text" name="sc[FM_HEIGHT]" label="Popup Window Height" value=$smarty.const.FM_HEIGHT|default:600 size="4"}
{control type="text" name="sc[FM_LIMIT]" label="Number of Files per Page" value=$smarty.const.FM_LIMIT|default:25 size="4"}
{control type="text" name="sc[FM_SIMLIMIT]" label="Number of Simultaneous Uploads" value=$smarty.const.FM_SIMLIMIT|default:3 size="2"}
{control type="text" name="sc[FM_HEIGHT]" label="Popup Window Height"|gettext value=$smarty.const.FM_HEIGHT|default:600 size="4"}
{control type="text" name="sc[FM_LIMIT]" label="Number of Files per Page"|gettext value=$smarty.const.FM_LIMIT|default:25 size="4"}
{control type="text" name="sc[FM_SIMLIMIT]" label="Number of Simultaneous Uploads"|gettext value=$smarty.const.FM_SIMLIMIT|default:3 size="2"}
{control type="checkbox" postfalse=1 name="sc[FM_THUMBNAILS]" label="Show Image Thumbnails?"|gettext checked=$smarty.const.FM_THUMBNAILS value=1}
{control type="text" name="sc[FM_THUMB_SIZE]" label="Thumbnail Size"|gettext value=$smarty.const.FM_THUMB_SIZE|default:48 size="4"}
{control type="text" name="sc[UPLOAD_WIDTH]" label="Uploader Default Max Width/Height to Downsize Graphics"|gettext value=$smarty.const.UPLOAD_WIDTH|default:400 size="4"}
Expand Down
Expand Up @@ -110,13 +110,13 @@
{/group}
{if function_exists('ldap_connect')}
{group label="LDAP Authentication"|gettext}
{control type="checkbox" postfalse=1 name="sc[USE_LDAP]" id=use_ldap label="Turn on LDAP Authentication?"|gettext checked=$smarty.const.USE_LDAP value=1 description=gt('Checking this option will cause Exponent to try to authenticate to the ldap server listed below.')}
{control type="checkbox" postfalse=1 name="sc[USE_LDAP]" id=use_ldap label="Turn on LDAP Authentication?"|gettext checked=$smarty.const.USE_LDAP value=1 description='Checking this option will cause Exponent to try to authenticate to the ldap server listed below.'|gettext}
<span id="ldap">
{control type="text" name="sc[LDAP_SERVER]" label="LDAP Server"|gettext value=$smarty.const.LDAP_SERVER description=gt('Enter the hostname or IP of the LDAP server.')}
{control type="text" name="sc[LDAP_BASE_CONTEXT]" label="Base Context"|gettext value=$smarty.const.LDAP_BASE_CONTEXT description=gt('Enter the Base Context for this LDAP connection. (e.g., ou=users, dc=mycompanysite, dc=local)')}
{control type="text" name="sc[LDAP_BASE_DN]" label="Base Domain"|gettext value=$smarty.const.LDAP_BASE_DN description=gt('Enter the Base Domain for this LDAP connection. (e.g., mycompanysite.local)')}
{control type="text" name="sc[LDAP_BIND_USER]" label="LDAP Bind User"|gettext value=$smarty.const.LDAP_BIND_USER description=gt('The username or context for the binding to the LDAP Server to perform administration tasks.')}
{control type="password" name="sc[LDAP_BIND_PASS]" label="LDAP Bind Password"|gettext value=$smarty.const.LDAP_BIND_PASS description=gt('Enter the password for the username/context listed above.')}
{control type="text" name="sc[LDAP_SERVER]" label="LDAP Server"|gettext value=$smarty.const.LDAP_SERVER description='Enter the hostname or IP of the LDAP server.'|gettext}
{control type="text" name="sc[LDAP_BASE_CONTEXT]" label="Base Context"|gettext value=$smarty.const.LDAP_BASE_CONTEXT description='Enter the Base Context for this LDAP connection. (e.g., ou=users, dc=mycompanysite, dc=local)'|gettext}
{control type="text" name="sc[LDAP_BASE_DN]" label="Base Domain"|gettext value=$smarty.const.LDAP_BASE_DN description='Enter the Base Domain for this LDAP connection. (e.g., mycompanysite.local)'|gettext}
{control type="text" name="sc[LDAP_BIND_USER]" label="LDAP Bind User"|gettext value=$smarty.const.LDAP_BIND_USER description='The username or context for the binding to the LDAP Server to perform administration tasks.'|gettext}
{control type="password" name="sc[LDAP_BIND_PASS]" label="LDAP Bind Password"|gettext value=$smarty.const.LDAP_BIND_PASS description='Enter the password for the username/context listed above.'|gettext}
</span>
{/group}
{/if}
Expand Down Expand Up @@ -164,7 +164,7 @@
{control type="dropdown" name="sc[DISPLAY_START_OF_WEEK]" label="Start of Week"|gettext items=$start_of_week default=$smarty.const.DISPLAY_START_OF_WEEK}
{/group}
{control type="dropdown" name="sc[DISPLAY_DEFAULT_TIMEZONE]" label="Default time zone for this site"|gettext|cat:(' <br />'|cat:("CAUTION: Changes may affect calendars and other features using date functions."|gettext)) items=$timezones default=$smarty.const.DISPLAY_DEFAULT_TIMEZONE}
{control type="radiogroup" name="sc[SLINGBAR_TOP]" label="Default Admin Slingbar Position" items="Top of Viewport,Bottom of Viewport"|gettxtlist values="1,0" default=$smarty.const.SLINGBAR_TOP}
{control type="radiogroup" name="sc[SLINGBAR_TOP]" label="Default Admin Slingbar Position"|gettext items="Top of Viewport,Bottom of Viewport"|gettxtlist values="1,0" default=$smarty.const.SLINGBAR_TOP}
{control type="text" name="sc[THUMB_QUALITY]" label="Thumbnail JPEG Quality"|gettext|cat:" (0 - 95)" value=$smarty.const.THUMB_QUALITY|default:75 size="2"}
{control type="checkbox" name="sc[AJAX_PAGING]" label="Use ajax paging if available"|gettext value=1 checked=$smarty.const.AJAX_PAGING description='Can decrease paging loading time'|gettext}
</div>
Expand All @@ -178,9 +178,9 @@
{control type="dropdown" name="sc[SITE_FILE_MANAGER]" label="File Manager"|gettext items="Traditional,elFinder"|gettxtlist values="picker,elfinder" default=$smarty.const.SITE_FILE_MANAGER}
{control type="dropdown" name="sc[ELFINDER_THEME]" label="elFinder Theme"|gettext items=$elf_themes default=$smarty.const.ELFINDER_THEME}
{control type="text" name="sc[FM_WIDTH]" label="Popup Window Width"|gettext value=$smarty.const.FM_WIDTH|default:1024 size="4"}
{control type="text" name="sc[FM_HEIGHT]" label="Popup Window Height" value=$smarty.const.FM_HEIGHT|default:600 size="4"}
{control type="text" name="sc[FM_LIMIT]" label="Number of Files per Page" value=$smarty.const.FM_LIMIT|default:25 size="4"}
{control type="text" name="sc[FM_SIMLIMIT]" label="Number of Simultaneous Uploads" value=$smarty.const.FM_SIMLIMIT|default:3 size="2"}
{control type="text" name="sc[FM_HEIGHT]" label="Popup Window Height"|gettext value=$smarty.const.FM_HEIGHT|default:600 size="4"}
{control type="text" name="sc[FM_LIMIT]" label="Number of Files per Page"|gettext value=$smarty.const.FM_LIMIT|default:25 size="4"}
{control type="text" name="sc[FM_SIMLIMIT]" label="Number of Simultaneous Uploads"|gettext value=$smarty.const.FM_SIMLIMIT|default:3 size="2"}
{control type="checkbox" postfalse=1 name="sc[FM_THUMBNAILS]" label="Show Image Thumbnails?"|gettext checked=$smarty.const.FM_THUMBNAILS value=1}
{control type="text" name="sc[FM_THUMB_SIZE]" label="Thumbnail Size"|gettext value=$smarty.const.FM_THUMB_SIZE|default:48 size="4"}
{control type="text" name="sc[UPLOAD_WIDTH]" label="Uploader Default Max Width/Height to Downsize Graphics"|gettext value=$smarty.const.UPLOAD_WIDTH|default:400 size="4"}
Expand Down
Expand Up @@ -115,7 +115,7 @@
<div>
{expCore::maxUploadSizeMessage()}
{form action=install_extension_confirm}
{control type=uploader name=mod_archive label=gt('Extension Archive')}
{control type=uploader name=mod_archive label='Extension Archive'|gettext}
{control type="checkbox" name="patch" label='Patch Exponent CMS or Install Theme?' value=1 description='All extensions are normally placed within the CURRENT theme (folder)'|gettext}
{control class=uploadfile type=buttongroup submit="Upload Extension"|gettext}
{/form}
Expand Down
Expand Up @@ -115,7 +115,7 @@
<div>
{expCore::maxUploadSizeMessage()}
{form action=install_extension_confirm}
{control type=uploader name=mod_archive label=gt('Extension Archive')}
{control type=uploader name=mod_archive label='Extension Archive'|gettext}
{control type="checkbox" name="patch" label='Patch Exponent CMS or Install Theme?' value=1 description='All extensions are normally placed within the CURRENT theme (folder)'|gettext}
{control class=uploadfile type=buttongroup submit="Upload Extension"|gettext}
{/form}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/blog/views/blog/bloglist.tpl
Expand Up @@ -79,7 +79,7 @@
{if $config.ffloat != "Below"}
{filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
{/if}
{$link = '<a href="'|cat:makeLink([controller=>blog, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:gt('(read more)')|cat:'</em></a>'}
{$link = '<a href="'|cat:makeLink([controller=>blog, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:'(read more)'|gettext|cat:'</em></a>'}
{if $config.usebody==1}
{*<p>{$item->body|summarize:"html":"paralinks"}</p>*}
<p>{$item->body|summarize:"html":"parahtml":$link}</p>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/blog/views/blog/showall_recent.tpl
Expand Up @@ -109,7 +109,7 @@
{if $config.ffloat != "Below"}
{filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
{/if}
{$link = '<a href="'|cat:makeLink([controller=>blog, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:gt('(read more)')|cat:'</em></a>'}
{$link = '<a href="'|cat:makeLink([controller=>blog, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:'(read more)'|gettext|cat:'</em></a>'}
{if $config.usebody==1}
{*<p>{$item->body|summarize:"html":"paralinks"}</p>*}
<p>{$item->body|summarize:"html":"parahtml":$link}</p>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/events/views/event/import.tpl
Expand Up @@ -28,7 +28,7 @@
<div class="alt-body">
{control type=radiogroup columns=2 name="file_type" items="Uploaded File,External Feed"|gettxtlist values="file,ext_feed" default=$record->file_type|default:"file"}
<div id="file-div" class="alt-item" style="display:none;">
{control type=uploader name=import_file accept=".ics" label=gt('.ics File to Import')}
{control type=uploader name=import_file accept=".ics" label='.ics File to Import'|gettext}
</div>
<div id="ext_feed-div" class="alt-item" style="display:none;">
{control type=url name=ext_feed label="External .ics Feed URL"|gettext value=$record->ext_file size=100}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/file/views/file/import_eql.tpl
Expand Up @@ -21,7 +21,7 @@
</div>
<div>
{form action=import_eql_process}
{control type=uploader name=file accept=".eql" label=gt('EQL File')}
{control type=uploader name=file accept=".eql" label='EQL File'|gettext}
{control class=uploadfile type=buttongroup submit="Restore"|gettext}
{/form}
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/file/views/file/import_files.tpl
Expand Up @@ -20,7 +20,7 @@
</div>
<div>
{form action=import_files_process}
{control type=uploader name=file accept="application/x-gzip" label=gt('Files Archive')}
{control type=uploader name=file accept="application/x-gzip" label='Files Archive'|gettext}
{control class=uploadfile type=buttongroup submit="Restore"|gettext}
{/form}
</div>
Expand Down
Expand Up @@ -90,7 +90,7 @@
{/if}
</div>
{/permissions}
{$link = '<a href="'|cat:makeLink([controller=>filedownload, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:gt('(read more)')|cat:'</em></a>'}
{$link = '<a href="'|cat:makeLink([controller=>filedownload, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:'(read more)'|gettext|cat:'</em></a>'}
{if $config.usebody!=2}
<div class="bodycopy">
{if $config.usebody==1}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/forms/views/forms/import_csv.tpl
Expand Up @@ -23,7 +23,7 @@
<div>
{form action=import_csv_mapper}
{control type="dropdown" name="delimiter" label="Delimiter Character"|gettext items=$delimiters}
{control type=uploader name=upload label=gt('CSV File to Upload')}
{control type=uploader name=upload label='CSV File to Upload'|gettext}
{control type="checkbox" name="use_header" label='First Row is a Header?' value=1}
{control type="text" name="rowstart" label="Forms Data begins in Row"|gettext value='1' size=6}
{control type="dropdown" name="forms_id" label="Target Form"|gettext items=$forms_list}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/forms/views/forms/import_eql.tpl
Expand Up @@ -21,7 +21,7 @@
<div>
{form action=import_eql_process}
{control type="checkbox" name="include_data" label='Should stored form data also be included if available?' value=1 description='By default the form settings and controls are imported without including form data records'|gettext}
{control type=uploader name=file accept=".eql" label=gt('Form EQL File')}
{control type=uploader name=file accept=".eql" label='Form EQL File'|gettext}
{control class=uploadfile type=buttongroup submit="Import Form Design"|gettext cancel="Cancel"|gettext}
{/form}
</div>
Expand Down
4 changes: 2 additions & 2 deletions framework/modules/importexport/views/importexport/import.tpl
Expand Up @@ -24,7 +24,7 @@
</blockquote>
{form action="import_select"}
{control type=hidden name=import_type value=$import_type}
{control type=uploader name=import_file accept=".eql" label=gt('EQL File to Import')}
{control type=uploader name=import_file accept=".eql" label='EQL File to Import'|gettext}
<label>{'Module to import into'|gettext}</label>
<table class="exp-skin-table aggregate">
<thead>
Expand Down Expand Up @@ -57,7 +57,7 @@
{*<h1>{"Upload Your"|gettext} {$type->basemodel_name|capitalize} {"File to Import"|gettext}</h1>*}
{*{form action=validate}*}
{*{control type="hidden" name="import_type" value=$type->baseclassname}*}
{*{control type=uploader name=import_file label=gt('File to Import')}*}
{*{control type=uploader name=import_file label='File to Import'|gettext}*}
{*{control type="buttongroup" submit="Import"|gettext|cat:"!" cancel="Cancel"|gettext}*}
{*{/form}*}
{*</div>*}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/news/views/news/newslist.tpl
Expand Up @@ -63,7 +63,7 @@
{if $config.ffloat != "Below"}
{filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
{/if}
{$link = '<a href="'|cat:makeLink([controller=>news, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:gt('(read more)')|cat:'</em></a>'}
{$link = '<a href="'|cat:makeLink([controller=>news, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:'(read more)'|gettext|cat:'</em></a>'}
{if $config.usebody==1}
{*<p>{$item->body|summarize:"html":"paralinks"}</p>*}
<p>{$item->body|summarize:"html":"parahtml":$link}</p>
Expand Down
Expand Up @@ -80,7 +80,7 @@
{if $config.ffloat != "Below"}
{filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
{/if}
{$link = '<a href="'|cat:makeLink([controller=>news, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:gt('(read more)')|cat:'</em></a>'}
{$link = '<a href="'|cat:makeLink([controller=>news, action=>show, title=>$item->sef_url])|cat:'"><em>'|cat:'(read more)'|gettext|cat:'</em></a>'}
{if $config.usebody==1}
{*<p>{$item->body|summarize:"html":"paralinks"}</p>*}
{elseif $config.usebody==3}
Expand Down

0 comments on commit 907082e

Please sign in to comment.