Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Dev Removed $clang for good
  • Loading branch information
c-schmitz committed Oct 17, 2014
1 parent b889cf6 commit 9b8d21e
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 22 deletions.
1 change: 0 additions & 1 deletion application/controllers/admin/translate.php
Expand Up @@ -357,7 +357,6 @@ private function _getSurveyButton($iSurveyID, $menuitem_url)
/*
* _getLanguageList() returns survey language list
* @param string $iSurveyID Survey id
* @param string @clang Language object
* @param string $tolang The target translation code
*/
private function _getLanguageList($iSurveyID, $tolang)
Expand Down
4 changes: 2 additions & 2 deletions application/helpers/admin/export/DocWriter.php
Expand Up @@ -19,7 +19,7 @@ public function __construct()
public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOptions)
{
parent::init($survey, $sLanguageCode, $oOptions);
$this->clang = new limesurvey_lang($sLanguageCode);
App()->setLanguage($sLanguageCode);

if ($oOptions->output=='display')
{
Expand Down Expand Up @@ -71,7 +71,7 @@ protected function outputRecord($headers, $values, FormattingOptions $oOptions)
{
$this->output .= "<br clear='all' style='page-break-before:always'>";
}
$this->output .= "<table><tr><th colspan='2'>".$this->clang->gT("Survey response")."</td></tr>".PHP_EOL;
$this->output .= "<table><tr><th colspan='2'>".gT("Survey response")."</td></tr>".PHP_EOL;

$counter = 0;
foreach ($headers as $header)
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/admin/export/PdfWriter.php
Expand Up @@ -56,7 +56,7 @@ public function outputRecord($headers, $values, FormattingOptions $oOptions)
{
$this->pdf->AddPage();
}
$this->pdf->Cell(0, 10, sprintf($this->clang->gT("Survey response %d"), $this->rowCounter), 1, 1);
$this->pdf->Cell(0, 10, sprintf(gT("Survey response %d"), $this->rowCounter), 1, 1);

$columnCounter = 0;
foreach($headers as $header)
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/common_helper.php
Expand Up @@ -5335,7 +5335,7 @@ function conditionalNewlineToBreak($mytext,$ishtml,$encoded='')
{
if ($ishtml === true)
{
// $mytext has been processed by clang->gT with html mode
// $mytext has been processed by gT with html mode
// and thus \n has already been translated to &#10;
if ($encoded == '')
{
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/replacements_helper.php
Expand Up @@ -36,7 +36,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
'percentcomplete', 'move', 'groupname', 'groupdescription', 'question', 'showxquestions',
'showgroupinfo', 'showqnumcode', 'questioncode', 'answer', 'navigator', 'help', 'totalquestions',
'surveyformat', 'completed', 'notanswered', 'privacy', 'surveyid', 'publicurl',
'templatedir', 'token', 'assessments', 's_lang', 'errormsg', 'clang', 'saved_id', 'usertemplaterootdir',
'templatedir', 'token', 'assessments', 's_lang', 'errormsg', 'saved_id', 'usertemplaterootdir',
'languagechanger', 'printoutput', 'captchapath', 'loadname');
*/
$allowedvars = array(
Expand Down
10 changes: 5 additions & 5 deletions application/views/admin/emailtemplates/email_language_tab.php
Expand Up @@ -85,14 +85,14 @@
)
)
);


echo "<div id='tab-$grouplang'>";
echo "<div class='tabsinner' id='tabsinner-$grouplang'>";
?>



<ul>
<?php
foreach ($tabs as $tab => $details)
Expand All @@ -105,7 +105,7 @@
<?php
foreach ($tabs as $tab => $details)
{
$this->renderPartial('/admin/emailtemplates/email_language_template_tab', compact('ishtml', 'surveyid' , 'esrow', 'grouplang', 'tab', 'details', 'clang'));
$this->renderPartial('/admin/emailtemplates/email_language_template_tab', compact('ishtml', 'surveyid' , 'esrow', 'grouplang', 'tab', 'details'));
}
?>
</div>
Expand Down
Expand Up @@ -50,7 +50,7 @@
{
$aDefaultTexts['admin_detailed_notification']=$aDefaultTexts['admin_detailed_notification_css'].conditionalNewlineToBreak($aDefaultTexts['admin_detailed_notification'],$ishtml);
}
$this->renderPartial('/admin/emailtemplates/email_language_tab', compact('surveyinfo', 'ishtml', 'surveyid', 'clang', 'grouplang', 'bplang', 'esrow', 'aDefaultTexts'));
$this->renderPartial('/admin/emailtemplates/email_language_tab', compact('surveyinfo', 'ishtml', 'surveyid', 'grouplang', 'bplang', 'esrow', 'aDefaultTexts'));
}
?>
</div>
Expand Down
4 changes: 2 additions & 2 deletions application/views/installer/dbconfig_view.php
@@ -1,6 +1,6 @@
<div class="row">
<div class="span3">
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
</div>
<div class="span9">
<?php echo CHtml::beginForm($this->createUrl('installer/database'), 'post', array('class' => 'form-horizontal')); ?>
Expand Down Expand Up @@ -53,7 +53,7 @@
echo CHtml::tag('div', array('class' => 'controls'), $row['control'] . CHtml::tag('div', array('class' => 'description-field'), $row['description']));
echo CHtml::closeTag('div');
}

?>
</fieldset>
<div class="row">
Expand Down
4 changes: 2 additions & 2 deletions application/views/installer/dbsettings_view.php
@@ -1,13 +1,13 @@
<div class="row">
<div class="span3">
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
</div>
<div class="span9">
<h2><?php echo $title; ?></h2>
<p><?php echo $descp; ?></p>
<h3><?php eT('Database creation'); ?></h3>
<?php if (isset($adminoutputText)) echo $adminoutputText; ?>

<div class="row">
<div class="span3" >
<input class="btn" type="button" value="<?php eT('Previous'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/database"); ?>', '_top')" />
Expand Down
2 changes: 1 addition & 1 deletion application/views/installer/license_view.php
@@ -1,6 +1,6 @@
<div class="row">
<div class="span3">
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep',)); ?>
</div>
<div class="span9">
<?php
Expand Down
4 changes: 2 additions & 2 deletions application/views/installer/optconfig_view.php
@@ -1,6 +1,6 @@
<div class="row">
<div class="span3">
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', )); ?>
</div>
<div class="span9">
<?php echo CHtml::beginForm($this->createUrl('installer/optional'), 'post', array('class' => 'form-horizontal')); ?>
Expand All @@ -12,7 +12,7 @@
</div>
<?php ?>
<fieldset>
<legend><?php
<legend><?php
eT("You can leave these settings blank and change them later");
?>

Expand Down
2 changes: 1 addition & 1 deletion application/views/installer/success_view.php
@@ -1,6 +1,6 @@
<div class="row">
<div class="span3">
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
</div>
<div class="span9">
<h2><?php echo $title; ?></h2>
Expand Down
4 changes: 2 additions & 2 deletions application/views/installer/welcome_view.php
@@ -1,6 +1,6 @@
<div class="row">
<div class="span3">
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep', 'clang')); ?>
<?php $this->renderPartial('/installer/sidebar_view', compact('progressValue', 'classesForStep')); ?>
</div>
<div class="span9">
<h2><?php echo $title; ?></h2>
Expand Down Expand Up @@ -33,5 +33,5 @@
</div>
<?php echo CHtml::endForm(); ?>
</div>

</div>

0 comments on commit 9b8d21e

Please sign in to comment.