Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Browse files Browse the repository at this point in the history
  • Loading branch information
@olleharstedt
olleharstedt committed Feb 12, 2016
2 parents e225aa4 + 25cfff6 commit 5a69f25
Show file tree
Hide file tree
Showing 11 changed files with 766 additions and 769 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/checkintegrity.php
View file
Expand Up @@ -793,7 +793,7 @@ protected function _checkintegrity()
/* Show a alert message is some fix is done */
if($bDirectlyFixed)
{
Yii::app()->setFlashMessage(gT("Some needed fix are already done."),'info');
Yii::app()->setFlashMessage(gT("Some automatic fixes were already applied."),'info');
}

return $aDelete;
Expand Down
7 changes: 3 additions & 4 deletions application/helpers/common_helper.php
View file
Expand Up @@ -224,10 +224,9 @@ function getSurveyList($returnarray=false, $surveyid=false)
{
$bCheckIntegrity=true;
Yii::app()->setFlashMessage(
sprintf(gT("One or more surveys seem broken, you must %s of the LimeSurvey database."),
CHtml::link(gT('check data integrity'),array("admin/checkintegrity"))
),
'error');
CHtml::link(gT("One or more surveys seem to be broken, please check data integrity of the LimeSurvey database."),array("admin/checkintegrity"))
,
'error');
}
}

Expand Down
4 changes: 2 additions & 2 deletions application/models/Boxes.php
View file
Expand Up @@ -110,7 +110,7 @@ public function getUsergroupname()
// Can't use switch because of empty case
if ( empty($usergroupid) || $usergroupid=='-2' )
{
return gT('Only admin');
return gT('Only Superadmin');
}
elseif ( $usergroupid=='-1' )
{
Expand All @@ -126,7 +126,7 @@ public function getUsergroupname()

// The group doesn't exist anymore
if(!is_object($oUsergroup))
return gT("Can't find group ! Only admin");
return gT("Can't find user group!");

return $oUsergroup->name;
}
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/homepagesettings/create.php
View file
Expand Up @@ -11,7 +11,7 @@
)
)); ?>

<h3><?php eT('Update Boxes');?> <em><?php echo $model->title; ?></em></h3>
<h3><?php eT('Update boxes');?> <em><?php echo $model->title; ?></em></h3>

<div class="row">
<div class="col-lg-12 content-right">
Expand Down
10 changes: 5 additions & 5 deletions application/views/admin/homepagesettings/index.php
View file
Expand Up @@ -15,16 +15,16 @@
)
)); ?>

<h3><?php eT('Home Page settings'); ?></h3>
<h3><?php eT('Home page settings'); ?></h3>

<div class="row">
<label class="col-sm-2 control-label"><?php eT("Display logo: ");?></label>
<label class="col-sm-2 control-label"><?php eT("Display logo:");?> </label>
<div class="col-sm-2">
<?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'show_logo', 'id'=>'show_logo', 'value'=>$bShowLogo));?>

<input type="hidden" id="show_logo-url" data-url="<?php echo App()->createUrl('admin/homepagesettings/sa/toggleShowLogoStatus');?>" />
</div>
<label class="col-sm-2 control-label"><?php eT("Show last visited survey and question: ");?></label>
<label class="col-sm-2 control-label"><?php eT("Show last visited survey and question:");?> </label>
<div class="col-sm-2">
<?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'show_last_survey_and_question', 'id'=>'show_last_survey_and_question', 'value'=>$bShowLastSurveyAndQuestion));?>
<input type="hidden" id="show_last_survey_and_question-url" data-url="<?php echo App()->createUrl('admin/homepagesettings/sa/toggleShowLastSurveyAndQuestion');?>" />
Expand All @@ -44,7 +44,7 @@
</div>
<div class="col-sm-1">

<input type="hidden" id="boxesupdatemessage" data-ajaxsuccessmessage="<?php eT('Boxes setting updated !');?>" />
<input type="hidden" id="boxesupdatemessage" data-ajaxsuccessmessage="<?php eT('Box settings updated!');?>" />
<button class="btn btn-default" type="button" id="save_boxes_setting" data-url="<?php echo App()->createUrl('admin/homepagesettings/sa/setBoxesSettings');?>"><?php eT('Save boxes settings');?></button>
</div>
<br/><br/><br/><br/>
Expand Down Expand Up @@ -86,7 +86,7 @@
'htmlOptions' => array('class' => 'col-md-1'),
),
array(
'header' => gT('Pointed url'),
'header' => gT('URL'),
'name' => 'url',
'value'=>'$data->url',
'htmlOptions' => array('class' => 'col-md-1'),
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/homepagesettings/update.php
View file
Expand Up @@ -12,7 +12,7 @@
)
)); ?>

<h3><?php eT('Update Boxes');?> <em><?php echo $model->title; ?></em></h3>
<h3><?php eT('Update boxes');?> <em><?php echo $model->title; ?></em></h3>

<div class="row">
<div class="col-lg-12 content-right">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/super/fullpagebar_view.php
View file
Expand Up @@ -50,7 +50,7 @@
<span class="icon-add text-success"></span>
<?php eT("Create a new box");?>
</a>
<a href="<?php echo $this->createUrl('admin/homepagesettings/sa/resetall/');?>" class="btn btn-danger" data-confirm="<?php eT('This will delete all curent boxes to restore the default ones. Are you sur you want to continue ?'); ?>">
<a href="<?php echo $this->createUrl('admin/homepagesettings/sa/resetall/');?>" class="btn btn-danger" data-confirm="<?php eT('This will delete all curent boxes to restore the default ones. Are you sure you want to continue ?'); ?>">
<span class="fa fa-refresh"></span>
<?php eT("Reset to default boxes");?>
</a>
Expand Down
7 changes: 4 additions & 3 deletions application/views/admin/survey/Question/editQuestion_view.php
View file
Expand Up @@ -217,8 +217,9 @@
<div class="form-group" id="OtherSelection">
<label class="col-sm-4 control-label"><?php eT("Option 'Other':"); ?></label>
<?php if ($activated != "Y"): ?>
<label for='OY'><?php eT("Yes"); ?></label><input id='OY' type='radio' class='radiobtn' name='other' value='Y' <?php if ($eqrow['other'] == "Y"){ echo ' checked '; }?> />&nbsp;&nbsp;
<label for='ON'><?php eT("No"); ?></label><input id='ON' type='radio' class='radiobtn' name='other' value='N' <?php if ($eqrow['other'] == "N" || $eqrow['other'] == "" ) { echo "checked='checked'";} ?> />
<div class="col-sm-8">
<?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array('name' => 'other', 'value'=> $eqrow['other'] === "Y"));?>
</div>
<?php else:?>
<?php eT("Cannot be changed (survey is active)");?>
<input type='hidden' name='other' value="<?php echo $eqrow['other']; ?>" />
Expand Down Expand Up @@ -249,7 +250,7 @@
<input class="form-control" type='text' id='preg' name='preg' size='50' value="<?php echo $eqrow['preg']; ?>" />
</div>
</div>

<?php if ($adding): ?>
<div id='Position' class='form-group'>
<label class="col-sm-4 control-label" for='pos'><?php eT("Position:"); ?></label>
Expand Down
10 changes: 5 additions & 5 deletions application/views/admin/update/updater/steps/_backup.php
View file
Expand Up @@ -37,21 +37,21 @@
switch ($dbBackupInfos->message)
{
case 'db_changes':
$db_message = gT('And the and of the process, the database will be updated.');
$db_message = gT('At the end of the process the database will be updated.');
case 'db_too_big':
$db_message = gT('Your database is too big to be saved!').' '.gT('Before proceeding please backup your database using a backup tool!');
$db_message = gT('Your database is too big to be saved!').' '.gT('Before proceeding please back up your database using a backup tool!');
break;
case 'no_db_changes':
$db_message = gT('This update will not change the database. No database backup is required.');
break;
case 'not_mysql':
$db_message = gT('Your database type is not MySQL!').' '.gT('Before proceeding please backup your database using a backup tool!');
$db_message = gT('Your database type is not MySQL!').' '.gT('Before proceeding please back up your database using a backup tool!');
break;
case 'db_backup_zip_failed':
$db_message = gT('We could not zip your database!').' '.gT('Before proceeding please backup your database using a backup tool!');
$db_message = gT('We could not zip your database!').' '.gT('Before proceeding please back up your database using a backup tool!');
break;
default :
$db_message = gT('Unable to backup your database for unknown reason.').' '.gT('Before proceeding please backup your database using a backup tool!');
$db_message = gT('Unable to backup your database for unknown reason.').' '.gT('Before proceeding please back up your database using a backup tool!');
break;
}
?>
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/usergroup/usergroups_view.php
View file
Expand Up @@ -8,7 +8,7 @@
?>
<?php $pageSize=Yii::app()->user->getState('pageSize',Yii::app()->params['defaultPageSize']);?>
<div class="col-lg-12">
<h3><?php eT('User Groups list'); ?></h3>
<h3><?php eT('User groups list'); ?></h3>

<div class="row">
<div class="col-lg-12 content-right">
Expand All @@ -28,7 +28,7 @@
'columns' => array(

array(
'header' => gT('User Group ID'),
'header' => gT('User group ID'),
'name' => 'usergroup_id',
'value'=>'$data->ugid',
'htmlOptions' => array('class' => 'col-md-1'),
Expand Down

0 comments on commit 5a69f25

Please sign in to comment.