Skip to content

Commit

Permalink
Fixed issue #13208: Missing translation in ComfortUpdate
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Jan 24, 2018
1 parent aaffeca commit c8df864
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 53 deletions.
78 changes: 39 additions & 39 deletions application/views/admin/update/manage/subscribe.php
View file
@@ -1,52 +1,52 @@
<?php
/**
* This file display the subscribe view
* The javascript inject it inside the div#updaterContainer, in the _updater view. (like any steps)
*/
* This file display the subscribe view
* The javascript inject it inside the div#updaterContainer, in the _updater view. (like any steps)
*/
?>
<div class="col-sm-12 list-surveys" id="comfortUpdateGeneralWrap">
<h3><span id="comfortUpdateIcon" class="icon-shield text-success"></span><?php eT("Subscribe to ComfortUpdate!");?></h3>
<h3><span id="comfortUpdateIcon" class="icon-shield text-success"></span><?php eT("Subscribe to ComfortUpdate!");?></h3>

<div class="" style="width: 75%; margin: auto;">
<br/>
<p>
<?php eT('The LimeSurvey ComfortUpdate is a great feature to easily update to the latest version of LimeSurvey. To use it you will need an update key.');?></p><p>
<?php
$aopen = '<a href="https://www.limesurvey.org/get-your-free-comfortupdate-trial-key" target="_blank">';
$aclose = '</a>';
?>
<?php echo sprintf(gT("You can get a free trial update key from %syour account on the limesurvey.org website%s."),$aopen, $aclose); ?>
<?php
$aopen = '<a href="https://www.limesurvey.org/sign-up">';
$aclose = '</a>';
?><br>
<?php echo sprintf(gT("If you don't have an account on limesurvey.org, please %sregister first%s."),$aopen, $aclose);?></p>
<div class="" style="width: 75%; margin: auto;">
<br/>
<p>
<?php eT('The LimeSurvey ComfortUpdate is a great feature to easily update to the latest version of LimeSurvey. To use it you will need an update key.');?></p><p>
<?php
$aopen = '<a href="https://www.limesurvey.org/get-your-free-comfortupdate-trial-key" target="_blank">';
$aclose = '</a>';
?>
<?php echo sprintf(gT("You can get a free trial update key from %syour account on the limesurvey.org website%s."),$aopen, $aclose); ?>
<?php
$aopen = '<a href="https://www.limesurvey.org/sign-up">';
$aclose = '</a>';
?><br>
<?php echo sprintf(gT("If you don't have an account on limesurvey.org, please %sregister first%s."),$aopen, $aclose);?></p>

<?php
echo CHtml::beginForm(App()->createUrl('/admin/update/sa/manage_submitkey'), 'post', array("id"=>""));
?>
<div class="form-group">
<?php
echo CHtml::label(gT('Enter your update key:'),'inputKey', array('class'=>'col-sm-2'));
?>
<div class='col-sm-2'>
<?php
echo CHtml::textField('keyid', '', array("id"=>"inputKey",'class'=>'form-control'));
echo CHtml::beginForm(App()->createUrl('/admin/update/sa/manage_submitkey'), 'post', array("id"=>""));
?>
<div class="form-group">
<?php
echo CHtml::label(gT('Enter your update key:'),'inputKey', array('class'=>'col-sm-2'));
?>
<div class='col-sm-2'>
<?php
echo CHtml::textField('keyid', '', array("id"=>"inputKey",'class'=>'form-control'));
?>
</div>
</div>
</div>
<?php echo CHtml::submitButton(gT('Submit'), array("class"=>"btn btn-default", "id"=>"submitKeyButton")); ?>
<?php echo CHtml::submitButton(gT('Submit'), array("class"=>"btn btn-default", "id"=>"submitKeyButton")); ?>

<a class="btn btn-default" href="<?php echo Yii::app()->createUrl("admin/update"); ?>" role="button" aria-disabled="false">
<?php eT("Cancel"); ?>
</a>
<?php echo CHtml::endForm();?>
<a class="btn btn-default" href="<?php echo Yii::app()->createUrl("admin/update"); ?>" role="button" aria-disabled="false">
<?php eT("Cancel"); ?>
</a>
<?php echo CHtml::endForm();?>

</div>
</div>

<!-- this javascript code manage the step changing. It will catch the form submission, then load the ComfortUpdate for the required build -->
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/assets/scripts/admin/comfortupdate/comfortUpdateNextStep.js"></script>
<script>
$('#submitKeyForm').comfortUpdateNextStep({'step': 0});
</script>
<!-- this javascript code manage the step changing. It will catch the form submission, then load the ComfortUpdate for the required build -->
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/assets/scripts/admin/comfortupdate/comfortUpdateNextStep.js"></script>
<script>
$('#submitKeyForm').comfortUpdateNextStep({'step': 0});
</script>
</div>
28 changes: 14 additions & 14 deletions application/views/admin/update/updater/welcome/_subscribe.php
View file
@@ -1,26 +1,26 @@
<?php
/**
* This file display the subscribe view
* The javascript inject it inside the div#updaterContainer, in the _updater view. (like any steps)
*/
* This file display the subscribe view
* The javascript inject it inside the div#updaterContainer, in the _updater view. (like any steps)
*/
?>
<h2 class="maintitle"><?php eT("Subscribe to ComfortUpdate!");?></h2>

<?php
if( isset($serverAnswer->html) )
echo $serverAnswer->html;
if( isset($serverAnswer->html) )
echo $serverAnswer->html;
?>

<div class="updater-background">
<br/>
<p>
<?php eT('The LimeSurvey ComfortUpdate is a great feature to easily update to the latest version of LimeSurvey. To use it you will need an update key.');?></p><p>
<?php
<?php
$aopen = '<a href="https://www.limesurvey.org/get-your-free-comfortupdate-trial-key" target="_blank">';
$aclose = '</a>';
?>
<?php echo sprintf(gT("You can get a free trial update key from %syour account on the limesurvey.org website%s."),$aopen, $aclose); ?>
<?php
?>
<?php echo sprintf(gT("You can get a free trial update key from %syour account on the limesurvey.org website%s."),$aopen, $aclose); ?>
<?php
$aopen = '<a href="https://www.limesurvey.org/en/cb-registration/registers">';
$aclose = '</a>';
?><br>
Expand All @@ -34,14 +34,14 @@
<?php
echo CHtml::label(gT('Enter your update key:'),'inputKey', array('class'=>'col-sm-2'));
?>
<div class='col-sm-1'>
<?php
echo CHtml::textField('keyid', '', array("id"=>"inputKey",'class'=>'form-control'));
?>
<div class='col-sm-2'>
<?php
echo CHtml::textField('keyid', '', array("id"=>"inputKey",'class'=>'form-control'));
?>
</div>
</div>
<?php
echo CHtml::submitButton('submit', array("class"=>"btn btn-default", "id"=>"submitKeyButton"));
echo CHtml::submitButton(gT('Submit'), array("class"=>"btn btn-default", "id"=>"submitKeyButton"));
?>
<a class="btn btn-default" href="<?php echo Yii::app()->createUrl("admin/update"); ?>" role="button" aria-disabled="false">
<?php eT("Cancel"); ?>
Expand Down

0 comments on commit c8df864

Please sign in to comment.