← Back to branch summary

~ubuntu-branches/ubuntu/wily/phabricator/wily-proposed

« back to all changes in this revision

Viewing changes to phabricator/src/applications/config/controller/PhabricatorConfigEditController.php

  • Committer: Package Import Robot
  • Author(s): Richard Sellam
  • Date: 2014-11-30 23:52:12 UTC
  • mfrom: (0.10.1) (0.9.1) (0.5.2) (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20141130235212-s3iwj9maq2lrlnq9
Tags: 0~git20141130-1
http://bugs.debian.org/769534
http://bugs.debian.org/769615
http://bugs.debian.org/768965
http://bugs.debian.org/768201
http://bugs.debian.org/771597
* New upstream version
* avoid mysql configuration in postinst if no credential provided
  (closes: #769534)
* added portuguese to debconf translations (closes: #769615)
* added german to debconf translations (closes: #768965)
* added logrotate on phd log files
* fixed po-debconf messages inconsistencies (closes: #768201)
* added dutch to debconf translations (closes: #771597)

Show diffs side-by-side

added added

removed removed

Lines of Context:
phabricator/src/applications/config/controller/PhabricatorConfigEditController.php
120
120
        ->setSeverity(AphrontErrorView::SEVERITY_WARNING)
121
121
        ->appendChild(phutil_tag('p', array(), $msg));
122
122
    } else if ($option->getLocked()) {
123
 
      $msg = pht(
124
 
        'This configuration is locked and can not be edited from the web '.
125
 
        'interface. Use `./bin/config` in `phabricator/` to edit it.');
126
123
 
 
124
      $msg = $option->getLockedMessage();
127
125
      $error_view = id(new AphrontErrorView())
128
126
        ->setTitle(pht('Configuration Locked'))
129
127
        ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)