Add/Edit/View Project languages
This commit is contained in:
Dan Cryer
parent
f6e433a94d
commit
cc58191048
|
|
@ -17,6 +17,7 @@ use b8\Exception\HttpException\NotFoundException;
|
|||
use b8\Store;
|
||||
use PHPCI\BuildFactory;
|
||||
use PHPCI\Helper\Github;
|
||||
use PHPCI\Helper\Lang;
|
||||
use PHPCI\Helper\SshKey;
|
||||
use PHPCI\Model\Build;
|
||||
use PHPCI\Model\Project;
|
||||
|
|
@ -68,7 +69,7 @@ class ProjectController extends \PHPCI\Controller
|
|||
$project = $this->projectStore->getById($projectId);
|
||||
|
||||
if (empty($project)) {
|
||||
throw new NotFoundException('Project with id: ' . $projectId . ' not found');
|
||||
throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
|
||||
}
|
||||
|
||||
$per_page = 10;
|
||||
|
|
@ -77,7 +78,8 @@ class ProjectController extends \PHPCI\Controller
|
|||
$pages = $builds[1] == 0 ? 1 : ceil($builds[1] / $per_page);
|
||||
|
||||
if ($page > $pages) {
|
||||
throw new NotFoundException('Page with number: ' . $page . ' not found');
|
||||
header('Location: '.PHPCI_URL.'project/view/'.$projectId);
|
||||
die;
|
||||
}
|
||||
|
||||
$this->view->builds = $builds[0];
|
||||
|
|
@ -107,7 +109,7 @@ class ProjectController extends \PHPCI\Controller
|
|||
}
|
||||
|
||||
if (empty($project)) {
|
||||
throw new NotFoundException('Project with id: ' . $projectId . ' not found');
|
||||
throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
|
||||
}
|
||||
|
||||
$email = $_SESSION['phpci_user']->getEmail();
|
||||
|
|
@ -174,7 +176,7 @@ class ProjectController extends \PHPCI\Controller
|
|||
*/
|
||||
public function add()
|
||||
{
|
||||
$this->layout->title = 'Add Project';
|
||||
$this->layout->title = Lang::get('add_project');
|
||||
$this->requireAdmin();
|
||||
|
||||
$method = $this->request->getMethod();
|
||||
|
|
@ -231,10 +233,11 @@ class ProjectController extends \PHPCI\Controller
|
|||
$project = $this->projectStore->getById($projectId);
|
||||
|
||||
if (empty($project)) {
|
||||
throw new NotFoundException('Project with id: ' . $projectId . ' not found');
|
||||
throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
|
||||
}
|
||||
|
||||
$this->config->set('page_title', 'Edit: ' . $project->getTitle());
|
||||
$this->layout->title = $project->getTitle();
|
||||
$this->layout->subtitle = Lang::get('edit_project');
|
||||
|
||||
$values = $project->getDataArray();
|
||||
$values['key'] = $values['ssh_private_key'];
|
||||
|
|
@ -262,7 +265,7 @@ class ProjectController extends \PHPCI\Controller
|
|||
return $view->render();
|
||||
}
|
||||
|
||||
$title = $this->getParam('title', 'New Project');
|
||||
$title = $this->getParam('title', Lang::get('new_project'));
|
||||
$reference = $this->getParam('reference', null);
|
||||
$type = $this->getParam('type', null);
|
||||
|
||||
|
|
@ -292,16 +295,16 @@ class ProjectController extends \PHPCI\Controller
|
|||
$form->addField(new Form\Element\Hidden('pubkey'));
|
||||
|
||||
$options = array(
|
||||
'choose' => 'Select repository type...',
|
||||
'github' => 'Github',
|
||||
'bitbucket' => 'Bitbucket',
|
||||
'gitlab' => 'Gitlab',
|
||||
'remote' => 'Remote URL',
|
||||
'local' => 'Local Path',
|
||||
'hg' => 'Mercurial',
|
||||
'choose' => Lang::get('select_repository_type'),
|
||||
'github' => Lang::get('github'),
|
||||
'bitbucket' => Lang::get('bitbucket'),
|
||||
'gitlab' => Lang::get('gitlab'),
|
||||
'remote' => Lang::get('remote'),
|
||||
'local' => Lang::get('local'),
|
||||
'hg' => Lang::get('hg'),
|
||||
);
|
||||
|
||||
$field = Form\Element\Select::create('type', 'Where is your project hosted?', true);
|
||||
$field = Form\Element\Select::create('type', Lang::get('where_hosted'), true);
|
||||
$field->setPattern('^(github|bitbucket|gitlab|remote|local|hg)');
|
||||
$field->setOptions($options);
|
||||
$field->setClass('form-control')->setContainerClass('form-group');
|
||||
|
|
@ -310,45 +313,42 @@ class ProjectController extends \PHPCI\Controller
|
|||
$container = new Form\ControlGroup('github-container');
|
||||
$container->setClass('github-container');
|
||||
|
||||
$field = Form\Element\Select::create('github', 'Choose a Github repository:', false);
|
||||
$field = Form\Element\Select::create('github', Lang::get('choose_github'), false);
|
||||
$field->setClass('form-control')->setContainerClass('form-group');
|
||||
$container->addField($field);
|
||||
$form->addField($container);
|
||||
|
||||
$field = Form\Element\Text::create('reference', 'Repository Name / URL (Remote) or Path (Local)', true);
|
||||
$field = Form\Element\Text::create('reference', Lang::get('repo_name'), true);
|
||||
$field->setValidator($this->getReferenceValidator($values));
|
||||
$field->setClass('form-control')->setContainerClass('form-group');
|
||||
$form->addField($field);
|
||||
|
||||
$field = Form\Element\Text::create('title', 'Project Title', true);
|
||||
$field = Form\Element\Text::create('title', Lang::get('project_title'), true);
|
||||
$field->setClass('form-control')->setContainerClass('form-group');
|
||||
$form->addField($field);
|
||||
|
||||
$title = 'Private key to use to access repository (leave blank for local and/or anonymous remotes)';
|
||||
$field = Form\Element\TextArea::create('key', $title, false);
|
||||
$field = Form\Element\TextArea::create('key', Lang::get('project_private_key'), false);
|
||||
$field->setClass('form-control')->setContainerClass('form-group');
|
||||
$field->setRows(6);
|
||||
$form->addField($field);
|
||||
|
||||
$label = 'PHPCI build config for this project (if you cannot add a phpci.yml file in the project repository)';
|
||||
$field = Form\Element\TextArea::create('build_config', $label, false);
|
||||
$field = Form\Element\TextArea::create('build_config', Lang::get('build_config'), false);
|
||||
$field->setClass('form-control')->setContainerClass('form-group');
|
||||
$field->setRows(6);
|
||||
$form->addField($field);
|
||||
|
||||
$field = Form\Element\Text::create('branch', 'Default branch name', true);
|
||||
$field = Form\Element\Text::create('branch', Lang::get('default_branch'), true);
|
||||
$field->setClass('form-control')->setContainerClass('form-group')->setValue('master');
|
||||
$form->addField($field);
|
||||
|
||||
$label = 'Enable public status page and image for this project?';
|
||||
$field = Form\Element\Checkbox::create('allow_public_status', $label, false);
|
||||
$field = Form\Element\Checkbox::create('allow_public_status', Lang::get('allow_public_status'), false);
|
||||
$field->setContainerClass('form-group');
|
||||
$field->setCheckedValue(1);
|
||||
$field->setValue(0);
|
||||
$form->addField($field);
|
||||
|
||||
$field = new Form\Element\Submit();
|
||||
$field->setValue('Save Project');
|
||||
$field->setValue(Lang::get('save_project'));
|
||||
$field->setContainerClass('form-group');
|
||||
$field->setClass('btn-success');
|
||||
$form->addField($field);
|
||||
|
|
@ -374,30 +374,30 @@ class ProjectController extends \PHPCI\Controller
|
|||
$validators = array(
|
||||
'hg' => array(
|
||||
'regex' => '/^(https?):\/\//',
|
||||
'message' => 'Mercurial repository URL must be start with http:// or https://'
|
||||
'message' => Lang::get('error_mercurial')
|
||||
),
|
||||
'remote' => array(
|
||||
'regex' => '/^(git|https?):\/\//',
|
||||
'message' => 'Repository URL must be start with git://, http:// or https://'
|
||||
'message' => Lang::get('error_remote')
|
||||
),
|
||||
'gitlab' => array(
|
||||
'regex' => '`^(.*)@(.*):(.*)/(.*)\.git`',
|
||||
'message' => 'GitLab Repository name must be in the format "user@domain.tld:owner/repo.git"'
|
||||
'message' => Lang::get('error_gitlab')
|
||||
),
|
||||
'github' => array(
|
||||
'regex' => '/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-\.]+$/',
|
||||
'message' => 'Repository name must be in the format "owner/repo"'
|
||||
'message' => Lang::get('error_github')
|
||||
),
|
||||
'bitbucket' => array(
|
||||
'regex' => '/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-\.]+$/',
|
||||
'message' => 'Repository name must be in the format "owner/repo"'
|
||||
'message' => Lang::get('error_bitbucket')
|
||||
),
|
||||
);
|
||||
|
||||
if (in_array($type, $validators) && !preg_match($validators[$type]['regex'], $val)) {
|
||||
throw new \Exception($validators[$type]['message']);
|
||||
} elseif ($type == 'local' && !is_dir($val)) {
|
||||
throw new \Exception('The path you specified does not exist.');
|
||||
throw new \Exception(Lang::get('error_path'));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -42,14 +42,16 @@ class Lang
|
|||
public static function init(Config $config)
|
||||
{
|
||||
// Try user language:
|
||||
$matches = array();
|
||||
if (isset($_SERVER) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
|
||||
$matches = array();
|
||||
|
||||
if (preg_match('/([a-zA-Z]{2}\-[a-zA-Z]{2})/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches)) {
|
||||
self::$language = strtolower($matches[1]);
|
||||
self::$strings = self::loadLanguage();
|
||||
if (preg_match('/([a-zA-Z]{2}\-[a-zA-Z]{2})/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches)) {
|
||||
self::$language = strtolower($matches[1]);
|
||||
self::$strings = self::loadLanguage();
|
||||
|
||||
if (!is_null(self::$strings)) {
|
||||
return;
|
||||
if (!is_null(self::$strings)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ $strings = array(
|
|||
'n_builds_running' => '%d builds running',
|
||||
'edit_profile' => 'Edit Profile',
|
||||
'sign_out' => 'Sign Out',
|
||||
'branch_x' => 'Branch: %s',
|
||||
'created_x' => 'Created: %s',
|
||||
'started_x' => 'Started: %s',
|
||||
|
||||
// Sidebar
|
||||
'hello_name' => 'Hello, %s',
|
||||
|
|
@ -49,4 +52,39 @@ $strings = array(
|
|||
'started' => 'Started',
|
||||
'successful' => 'Successful',
|
||||
'failed' => 'Failed',
|
||||
|
||||
// Add/Edit Project:
|
||||
'new_project' => 'New Project',
|
||||
'project_x_not_found' => 'Project with ID %d does not exist.',
|
||||
'project_details' => 'Project Details',
|
||||
'public_key_help' => 'To make it easier to get started, we\'ve generated an SSH key pair for you to use
|
||||
for this project. To use it, just add the following public key to the "deploy keys" section
|
||||
of your chosen source code hosting platform.',
|
||||
'select_repository_type' => 'Select repository type...',
|
||||
'github' => 'Github',
|
||||
'bitbucket' => 'Bitbucket',
|
||||
'gitlab' => 'Gitlab',
|
||||
'remote' => 'Remote URL',
|
||||
'local' => 'Local Path',
|
||||
'hg' => 'Mercurial',
|
||||
|
||||
'where_hosted' => 'Where is your project hosted?',
|
||||
'choose_github' => 'Choose a Github repository:',
|
||||
|
||||
'repo_name' => 'Repository Name / URL (Remote) or Path (Local)',
|
||||
'project_title' => 'Project Title',
|
||||
'project_private_key' => 'Private key to use to access repository
|
||||
(leave blank for local and/or anonymous remotes)',
|
||||
'build_config' => 'PHPCI build config for this project
|
||||
(if you cannot add a phpci.yml file in the project repository)',
|
||||
'default_branch' => 'Default branch name',
|
||||
'allow_public_status' => 'Enable public status page and image for this project?',
|
||||
'save_project' => 'Save Project',
|
||||
|
||||
'error_mercurial' => 'Mercurial repository URL must be start with http:// or https://',
|
||||
'error_remote' => 'Repository URL must be start with git://, http:// or https://',
|
||||
'error_gitlab' => 'GitLab Repository name must be in the format "user@domain.tld:owner/repo.git"',
|
||||
'error_github' => 'Repository name must be in the format "owner/repo"',
|
||||
'error_bitbucket' => 'Repository name must be in the format "owner/repo"',
|
||||
'error_path' => 'The path you specified does not exist.',
|
||||
);
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
<?php use PHPCI\Helper\Lang; ?>
|
||||
<li>
|
||||
<a href="<?php print PHPCI_URL; ?>build/view/<?php print $build->getId(); ?>">
|
||||
<?php if ($build->getCommitterEmail()): ?>
|
||||
|
|
@ -10,11 +11,11 @@
|
|||
<?php print $build->getProject()->getTitle(); ?>
|
||||
|
||||
<?php if ($build->getStatus() == \PHPCI\Model\Build::STATUS_NEW): ?>
|
||||
<small class="pull-right">Created <?php print $build->getCreated()->format('g:ia'); ?></small>
|
||||
<small class="pull-right"><?php Lang::out('created_x', $build->getCreated()->format('H:i')); ?></small>
|
||||
<?php elseif ($build->getStatus() == \PHPCI\Model\Build::STATUS_RUNNING): ?>
|
||||
<small class="pull-right">Started <?php print $build->getStarted()->format('g:ia'); ?></small>
|
||||
<small class="pull-right"><?php Lang::out('started_x', $build->getStarted()->format('H:i')); ?></small>
|
||||
<?php endif; ?>
|
||||
</h4>
|
||||
<p>Branch: <?php print $build->getBranch(); ?></p>
|
||||
<p><?php Lang::out('branch_x', $build->getBranch()); ?></p>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
<?php use PHPCI\Helper\Lang; ?>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-sm-8">
|
||||
<div class="box box-primary">
|
||||
<div class="box-header">
|
||||
<h3 class="box-title">Project Details</h3>
|
||||
<h3 class="box-title"><?php Lang::out('project_details'); ?></h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
|
|
@ -16,7 +17,7 @@
|
|||
<div class="col-sm-4">
|
||||
<div class="box box-info">
|
||||
<div class="box-body">
|
||||
<p>To make it easier to get started, we've generated a public / private key pair for you to use for this project. To use it, just add the following public key to the "deploy keys" section of your repository settings on Github / Bitbucket.</p>
|
||||
<p><?php Lang::out('public_key_help'); ?></p>
|
||||
|
||||
<textarea style="width: 90%; height: 150px;"><?php print $key ?></textarea>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue