Merge remote-tracking branch 'origin/master' into v/1.7
This commit is contained in:
commit
e6b02b6019
|
@ -444,7 +444,7 @@ class SettingsController extends Controller
|
|||
$field->setClass('form-control');
|
||||
$field->setContainerClass('form-group');
|
||||
$field->setOptions(Lang::getLanguageOptions());
|
||||
$field->setValue('en');
|
||||
$field->setValue(Lang::getLanguage());
|
||||
$form->addField($field);
|
||||
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ PHPCI',
|
|||
'reset_email_title' => 'PHPCI Passwort zurücksetzen für %s',
|
||||
'reset_invalid' => 'Fehlerhafte Anfrage für das Zurücksetzen eines Passwortes',
|
||||
'email_address' => 'Emailadresse',
|
||||
'login' => 'Login / Email Address',
|
||||
'login' => 'Login / Emailadresse',
|
||||
'password' => 'Passwort',
|
||||
'log_in' => 'Einloggen',
|
||||
|
||||
|
@ -115,8 +115,8 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
|
|||
(falls Sie Ihrem Projektrepository kein phpci.yml hinzufügen können)',
|
||||
'default_branch' => 'Name des Standardbranches',
|
||||
'allow_public_status' => 'Öffentliche Statusseite und -bild für dieses Projekt einschalten?',
|
||||
'archived' => 'Archived',
|
||||
'archived_menu' => 'Archived',
|
||||
'archived' => 'Archiviert',
|
||||
'archived_menu' => 'Archiviert',
|
||||
'save_project' => 'Projekt speichern',
|
||||
|
||||
'error_mercurial' => 'Mercurial Repository-URL muss mit http://, oder https:// beginnen',
|
||||
|
@ -130,7 +130,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
|
|||
'all_branches' => 'Alle Branches',
|
||||
'builds' => 'Builds',
|
||||
'id' => 'ID',
|
||||
'date' => 'Date',
|
||||
'date' => 'Datum',
|
||||
'project' => 'Projekt',
|
||||
'commit' => 'Commit',
|
||||
'branch' => 'Branch',
|
||||
|
@ -151,6 +151,9 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
|
|||
'webhooks_help_bitbucket' => 'Um für dieses Projekt automatisch einen Build zu starten, wenn neue Commits gepushed werden, fügen Sie die untenstehende URL als "POST" Service in der <a href="https://bitbucket.org/%s/admin/services">Services</a>-Sektion Ihres Bitbucket Repositories hinzu.',
|
||||
|
||||
// View Build
|
||||
'errors' => 'Fehler',
|
||||
'information' => 'Information',
|
||||
|
||||
'build_x_not_found' => 'Build mit ID %d existiert nicht.',
|
||||
'build_n' => 'Build %d',
|
||||
'rebuild_now' => 'Build neu starten',
|
||||
|
@ -209,14 +212,14 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
|
|||
'build_created' => 'Build erstellt',
|
||||
'build_started' => 'Build gestartet',
|
||||
'build_finished' => 'Build abgeschlossen',
|
||||
'test_message' => 'Message',
|
||||
'test_no_message' => 'No message',
|
||||
'test_success' => 'Successful: %d',
|
||||
'test_fail' => 'Failures: %d',
|
||||
'test_skipped' => 'Skipped: %d',
|
||||
'test_error' => 'Errors: %d',
|
||||
'test_message' => 'Nachricht',
|
||||
'test_no_message' => 'Keine Nachricht',
|
||||
'test_success' => 'Erfolgreich: %d',
|
||||
'test_fail' => 'Fehlschläge: %d',
|
||||
'test_skipped' => 'Übersprungen: %d',
|
||||
'test_error' => 'Fehler: %d',
|
||||
'test_todo' => 'Todos: %d',
|
||||
'test_total' => '%d test(s)',
|
||||
'test_total' => '%d Test(s)',
|
||||
|
||||
// Users
|
||||
'name' => 'Name',
|
||||
|
@ -292,6 +295,19 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
|
|||
'search_packagist_for_more' => 'Packagist nach mehr Packages durchsuchen',
|
||||
'search' => 'Suchen »',
|
||||
|
||||
// Summary plugin
|
||||
'build-summary' => 'Zusammenfassung',
|
||||
'stage' => 'Abschnitt',
|
||||
'duration' => 'Dauer',
|
||||
'plugin' => 'Plugin',
|
||||
'stage_setup' => 'Vorbereitung',
|
||||
'stage_test' => 'Test',
|
||||
'stage_complete' => 'Vollständig',
|
||||
'stage_success' => 'Erfolg',
|
||||
'stage_failure' => 'Fehlschlag',
|
||||
'stage_broken' => 'Defekt',
|
||||
'stage_fixed' => 'Behoben',
|
||||
|
||||
// Installer
|
||||
'installation_url' => 'PHPCI Installations-URL',
|
||||
'db_host' => 'Datenbankserver',
|
||||
|
@ -400,5 +416,18 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
|
|||
'build_file_missing' => 'Angegebene Builddatei existiert nicht.',
|
||||
'property_file_missing' => 'Angegebene Eigenschaftsdatei existiert nicht.',
|
||||
'could_not_process_report' => 'Konnte den von diesem Tool erstellten Bericht nicht verarbeiten.',
|
||||
'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.'
|
||||
'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.',
|
||||
|
||||
// Error Levels:
|
||||
'critical' => 'Kritisch',
|
||||
'high' => 'Hoch',
|
||||
'normal' => 'Normal',
|
||||
'low' => 'Niedrig',
|
||||
|
||||
// Plugins that generate errors:
|
||||
'php_mess_detector' => 'PHP Mess Detector',
|
||||
'php_code_sniffer' => 'PHP Code Sniffer',
|
||||
'php_unit' => 'PHP Unit',
|
||||
'php_cpd' => 'PHP Copy/Paste Detector',
|
||||
'php_docblock_checker' => 'PHP Docblock Checker',
|
||||
);
|
||||
|
|
|
@ -130,7 +130,7 @@ od wybranego kodu źródłowego platformy hostingowej.',
|
|||
'all_branches' => 'Wszystkie Gałęzie',
|
||||
'builds' => 'Budowania',
|
||||
'id' => 'ID',
|
||||
'date' => 'Date',
|
||||
'date' => 'Data',
|
||||
'project' => 'Projekt',
|
||||
'commit' => 'Commit',
|
||||
'branch' => 'Gałąź',
|
||||
|
@ -206,14 +206,14 @@ Services</a> repozytoria Bitbucket.',
|
|||
'build_created' => 'Budowanie Stworzone',
|
||||
'build_started' => 'Budowanie Rozpoczęte',
|
||||
'build_finished' => 'Budowanie Zakończone',
|
||||
'test_message' => 'Message',
|
||||
'test_no_message' => 'No message',
|
||||
'test_success' => 'Successful: %d',
|
||||
'test_fail' => 'Failures: %d',
|
||||
'test_skipped' => 'Skipped: %d',
|
||||
'test_error' => 'Errors: %d',
|
||||
'test_todo' => 'Todos: %d',
|
||||
'test_total' => '%d test(s)',
|
||||
'test_message' => 'Wiadomość',
|
||||
'test_no_message' => 'Brak wiadomości',
|
||||
'test_success' => 'Powodzenie: %d',
|
||||
'test_fail' => 'Niepowodzenia: %d',
|
||||
'test_skipped' => 'Pominęte: %d',
|
||||
'test_error' => 'Błędy: %d',
|
||||
'test_todo' => 'Do zrobienia: %d',
|
||||
'test_total' => '%d test(ów)',
|
||||
|
||||
// Users
|
||||
'name' => 'Nazwa',
|
||||
|
@ -344,10 +344,10 @@ Przejrzyj powyższą listę błędów przed kontynuowaniem.',
|
|||
'incorrect_format' => 'Niepoprawny format',
|
||||
|
||||
// Create Build Command
|
||||
'create_build_project' => 'Create a build for a project',
|
||||
'project_id_argument' => 'A project ID',
|
||||
'commit_id_option' => 'Commit ID to build',
|
||||
'branch_name_option' => 'Branch to build',
|
||||
'create_build_project' => 'Utwórz budowanie dla projektu',
|
||||
'project_id_argument' => 'ID projektu',
|
||||
'commit_id_option' => 'ID Commita do budowania',
|
||||
'branch_name_option' => 'Gałąź do budowania',
|
||||
|
||||
// Run Command
|
||||
'run_all_pending' => 'Uruchom wszystkie oczekujące budowy w PHPCI',
|
||||
|
|
|
@ -23,6 +23,7 @@ class Deployer implements \PHPCI\Plugin
|
|||
{
|
||||
protected $webhookUrl;
|
||||
protected $reason;
|
||||
protected $updateOnly;
|
||||
|
||||
/**
|
||||
* Set up the plugin, configure options, etc.
|
||||
|
@ -43,6 +44,8 @@ class Deployer implements \PHPCI\Plugin
|
|||
if (isset($options['reason'])) {
|
||||
$this->reason = $options['reason'];
|
||||
}
|
||||
|
||||
$this->updateOnly = isset($options['update_only']) ? (bool) $options['update_only'] : true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -61,6 +64,8 @@ class Deployer implements \PHPCI\Plugin
|
|||
'reason' => $this->phpci->interpolate($this->reason),
|
||||
'source' => 'PHPCI',
|
||||
'url' => $this->phpci->interpolate('%BUILD_URI%'),
|
||||
'branch' => $this->phpci->interpolate('%BRANCH%'),
|
||||
'update_only' => $this->updateOnly
|
||||
));
|
||||
|
||||
return $response['success'];
|
||||
|
|
|
@ -116,8 +116,7 @@ class Lint implements PHPCI\Plugin
|
|||
continue;
|
||||
}
|
||||
|
||||
$itemPath = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
|
||||
$itemPath .= ltrim($item->getFilename(), DIRECTORY_SEPARATOR);
|
||||
$itemPath = $path . $item->getFilename();
|
||||
|
||||
if (in_array($itemPath, $this->ignore)) {
|
||||
continue;
|
||||
|
|
|
@ -33,3 +33,6 @@ Contributions from others would be very much appreciated! Please read our [guide
|
|||
|
||||
##Questions?
|
||||
Your best place to go is the [mailing list](https://groups.google.com/forum/#!forum/php-ci), if you're already a member of the mailing list, you can simply email php-ci@googlegroups.com.
|
||||
|
||||
|
||||
Test
|
||||
|
|
Loading…
Reference in a new issue