diff options
| author | Stefan Giehl <stefan.giehl@mayflower.de> | 2014-01-31 13:59:32 +0400 |
|---|---|---|
| committer | Stefan Giehl <stefan.giehl@mayflower.de> | 2014-01-31 13:59:32 +0400 |
| commit | a0f1b693fe7a6a33c2393bcbaa99ebeadf3e1175 (patch) | |
| tree | 7e425811323eb0c5918168db2c8c526f3eaccf1d | |
| parent | 502956f53b6938666f8e7c83c365f95e0741c8ba (diff) | |
| parent | 0688801f2f94bc1986673fa58df6ba3ad097c539 (diff) | |
Merge pull request #216 from craue/i18n-file-integrity-warning
made file integrity warning completely translatable
| -rw-r--r-- | core/Filechecks.php | 2 | ||||
| -rw-r--r-- | lang/en.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/Filechecks.php b/core/Filechecks.php index 30c519a1ca..8560001400 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -123,7 +123,7 @@ class Filechecks if (!class_exists('Piwik\\Manifest')) { $git = SettingsPiwik::getCurrentGitBranch(); if(empty($git)) { - $messages[] = Piwik::translate('General_WarningFileIntegrityNoManifest') . " If you are deploying Piwik from Git, this message is normal."; + $messages[] = Piwik::translate('General_WarningFileIntegrityNoManifest') . ' ' . Piwik::translate('General_WarningFileIntegrityNoManifestDeployingFromGit'); } return $messages; } diff --git a/lang/en.json b/lang/en.json index 1b7e7d844c..4ef71b738e 100644 --- a/lang/en.json +++ b/lang/en.json @@ -327,6 +327,7 @@ "ExceptionUnableToStartSession": "Unable to start session.", "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "The user has to be either a Super User or the user '%s' itself.", "WarningFileIntegrityNoManifest": "File integrity check could not be performed due to missing manifest.inc.php.", + "WarningFileIntegrityNoManifestDeployingFromGit": "If you are deploying Piwik from Git, this message is normal.", "WarningFileIntegrityNoMd5file": "File integrity check could not be completed due to missing md5_file() function.", "FileIntegrityWarningExplanation": "File integrity check failed and reported some errors. This is most likely due to a partial or failed upload of some of the Piwik files. You should reupload all the Piwik files in BINARY mode and refresh this page until it shows no error.", "UseSMTPServerForEmail": "Use SMTP server for e-mail", |