Skip to content

Commit

Permalink
Dev Some translation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Feb 11, 2020
1 parent 21ba0be commit 7a1d14b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions application/controllers/admin/UserManagement.php
View file
Expand Up @@ -320,7 +320,7 @@ public function deleteMultiple()
}
}

$tableLabels = array(gT('User id'), gT('Username'), gT('Status'));
$tableLabels = array(gT('User ID'), gT('Username'), gT('Status'));

Yii::app()->getController()->renderPartial(
'ext.admin.survey.ListSurveysWidget.views.massive_actions._action_results',
Expand Down Expand Up @@ -647,7 +647,7 @@ public function renderSelectedItems()
$aResults[$user]['result'] = gT('Selected');
}
//set Modal table labels
$tableLabels = array(gT('User id'), gT('Username'), gT('Status'));
$tableLabels = array(gT('User ID'), gT('Username'), gT('Status'));

App()->getController()->renderPartial(
'ext.admin.grid.MassiveActionsWidget.views._selected_items',
Expand Down Expand Up @@ -761,7 +761,7 @@ public function batchAddGroup()
}
}

$tableLabels = array(gT('User id'), gT('Username'), gT('Status'));
$tableLabels = array(gT('User ID'), gT('Username'), gT('Status'));

Yii::app()->getController()->renderPartial(
'ext.admin.survey.ListSurveysWidget.views.massive_actions._action_results',
Expand Down Expand Up @@ -811,7 +811,7 @@ public function batchApplyRoles()
}


$tableLabels = array(gT('User id'), gT('Username'), gT('Status'));
$tableLabels = array(gT('User ID'), gT('Username'), gT('Status'));

Yii::app()->getController()->renderPartial(
'ext.admin.survey.ListSurveysWidget.views.massive_actions._action_results',
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/expressions/em_core_helper.php
View file
Expand Up @@ -2083,7 +2083,7 @@ private function RDP_RunFunction($funcNameToken, $params)
if ($numArgsAllowed[0] < 0) {
$minArgs = abs($numArgsAllowed[0] + 1); // so if value is -2, means that requires at least one argument
if ($argsPassed < $minArgs) {
$this->RDP_AddError(sprintf(Yii::t("Function must have at least %s argument|Function must have at least %s arguments", $minArgs), $minArgs), $funcNameToken);
$this->RDP_AddError(sprintf(gT("Function must have at least %s argument|Function must have at least %s arguments", $minArgs), $minArgs), $funcNameToken);
return false;
}
if (!$this->RDP_onlyparse) {
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/expressions/em_manager_helper.php
View file
Expand Up @@ -5676,7 +5676,7 @@ private function _UpdateValuesInDatabase($finished=false)
$submitdate = date("Y-m-d H:i:s",mktime(0,0,0,1,1,1980));
}
if (!Response::model($this->sid)->updateByPk($oResponse->id,array('submitdate'=>$submitdate))) {
LimeExpressionManager::addFrontendFlashMessage('error', $this->gT('An error happen when try to submit your response.'), $this->sid);
LimeExpressionManager::addFrontendFlashMessage('error', $this->gT('An error happened when trying to submit your response.'), $this->sid);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions application/models/InstallerConfigForm.php
View file
Expand Up @@ -267,15 +267,15 @@ public function validateDBEngine($attribute)
{
if ($this->isMysql
&& ($this->dbengine === null or !in_array($this->dbengine, array_keys($this->dbEngines)))) {
$this->addError($attribute, Yii::t('app', 'The database engine type must be set for MySQL'));
$this->addError($attribute, gT('The database engine type must be set for MySQL'));
}

if ($this->isMysql && $this->dbengine === self::ENGINE_TYPE_INNODB) {
if (!$this->isInnoDbLargeFilePrefixEnabled()) {
$this->addError($attribute, Yii::t('app', 'You need to enable large_file_prefix setting in your database configuration in order to use InnoDB engine for LimeSurvey!'));
$this->addError($attribute, gT('You need to enable large_file_prefix setting in your database configuration in order to use InnoDB engine for LimeSurvey!'));
}
if (!$this->isInnoDbBarracudaFileFormat()) {
$this->addError($attribute, Yii::t('app', 'Your database configuration needs to have innodb_file_format and innodb_file_format_max set to use the Barracuda format in order to use InnoDB engine for LimeSurvey!'));
$this->addError($attribute, gT('Your database configuration needs to have innodb_file_format and innodb_file_format_max set to use the Barracuda format in order to use InnoDB engine for LimeSurvey!'));
}
}
}
Expand Down Expand Up @@ -382,8 +382,8 @@ private function isInnoDbBarracudaFileFormat() {
*/
public function getDbEngines() {
return [
self::ENGINE_TYPE_MYISAM => Yii::t('app', 'MyISAM'),
self::ENGINE_TYPE_INNODB => Yii::t('app', 'InnoDB'),
self::ENGINE_TYPE_MYISAM => 'MyISAM',
self::ENGINE_TYPE_INNODB => 'InnoDB'
];
}

Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/survey/activateSurvey_view.php
View file
Expand Up @@ -226,7 +226,7 @@ function alertPrivacy()
<div class="row">
<div class='col-sm-7 col-sm-offset-2'>

<div class="alert alert-warning"><?= Yii::t('app', 'Note: This survey has a past expiration date configured and is currently not available to participants. Please remember to update/remove the expiration date in the survey settings after activation.')?><div>
<div class="alert alert-warning"><?php eT('Note: This survey has a past expiration date configured and is currently not available to participants. Please remember to update/remove the expiration date in the survey settings after activation.')?><div>
</div>

</div>
Expand Down

0 comments on commit 7a1d14b

Please sign in to comment.