* Fix languages.

module/api/control.php

@@ -616,7 +616,7 @@ class api extends control
         if(intval($libID) > 0)
         {
             $menu .= "<div class='dropdown' id='createDropdown'>";
-            $menu .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> " . $this->lang->curd->create . " <span class='caret'></span></button>";
+            $menu .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> " . $this->lang->api->createAB . " <span class='caret'></span></button>";
             $menu .= "<ul class='dropdown-menu pull-right'>";
 
             /* check has permission create api doc */
@@ -679,7 +679,7 @@ EOT;
         foreach($libs as $key => $lib)
         {
             $selected = $key == $libID ? 'selected' : '';
-            $output   .= html::a(inlink('index', "libID=$key"), $lib->name, '', "class='$selected' data-app='{$this->app->tab}'");
+            $output  .= html::a(inlink('index', "libID=$key"), $lib->name, '', "class='$selected' data-app='{$this->app->tab}'");
         }
         $output .= "</div></div></div></div></div>";
 
@@ -688,7 +688,7 @@ EOT;
         if(!empty($versions))
         {
             $versionName = $version > 0 ? $versions[$version]->version : $this->lang->api->defaultVersion;
-            $output      .= <<<EOT
+            $output     .= <<<EOT
 <div class='btn-group angle-btn'>
   <div class='btn-group'>
     <button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$versionName} <span class='caret'></span>

module/api/lang/en.php

@@ -21,9 +21,11 @@ $lang->api->publish          = 'Publish';
 $lang->api->editPublish      = 'Edit Publish';
 $lang->api->createLib        = 'Create Api Library';
 $lang->api->createApi        = 'Create Api';
+$lang->api->createAB         = 'Create';
 $lang->api->edit             = 'Edit';
 $lang->api->delete           = 'Delete';
 $lang->api->position         = 'Positions';
+$lang->api->startLine        = "%s,%s";
 $lang->api->desc             = 'Description';
 $lang->api->debug            = 'Debug';
 $lang->api->submit           = 'Submit';
@@ -52,8 +54,23 @@ $lang->api->basicInfo        = 'Essential Information';
 $lang->api->apiDesc          = 'Interface Description';
 $lang->api->confirmDelete    = "Are you sure to delete this interface？";
 $lang->api->confirmDeleteLib = "Are you sure to delete this interface library？";
+$lang->api->filterStruct     = "use struct";
 $lang->api->defaultVersion   = "Current Version";
 
+/* Common access control lang. */
+$lang->api->whiteList          = 'White list';
+$lang->api->aclList['open']    = 'Open';
+$lang->api->aclList['private'] = 'Private';
+$lang->api->aclList['custom']  = 'Custom';
+$lang->api->group              = 'Group';
+$lang->api->user               = 'User';
+
+$lang->api->noticeAcl = array(
+    'open'    => 'Users who can access the api library which the library belongs can access it.',
+    'custom'  => 'Users in the whiltelist can access it.',
+    'private' => 'Only the one who created it can access it.',
+);
+
 /* fields of struct */
 $lang->struct = new stdClass();
 
@@ -82,6 +99,7 @@ $lang->api->structAddedBy      = 'Creator';
 $lang->api->structAddedDate    = 'Created Time';
 $lang->api->name               = 'Interface Library Name';
 $lang->api->baseUrl            = 'Base Url';
+$lang->api->baseUrlDesc        = 'Site or path. for example, api.zentao.com or /v1';
 $lang->api->desc               = 'Description';
 $lang->api->control            = 'Access Control';
 $lang->api->noLib              = 'There is no interface library at present。';
@@ -163,24 +181,13 @@ $lang->api->paramsTypeOptions = array(
     'double'   => 'double',
     'decimal'  => 'decimal'
 );
+
 /* Api params */
 $lang->api->paramsTypeCustomOptions = array(
     'file' => 'file',
     'ref'  => 'ref',
 );
 
-$lang->api->position  = 'Position';
-$lang->api->startLine = "%s,%s";
-$lang->api->desc      = 'Description';
-$lang->api->debug     = 'Debug';
-$lang->api->submit    = 'Submit';
-$lang->api->url       = 'Request URL';
-$lang->api->result    = 'Results';
-$lang->api->status    = 'Status';
-$lang->api->data      = 'Data';
-$lang->api->noParam   = 'No parameters required if GET Debug';
-$lang->api->post      = 'Refer to page list if POST Debug';
-
 $lang->api->structParamsOptons   = array_merge($lang->api->paramsTypeOptions, array('file' => 'file', 'ref' => 'ref'));
 $lang->api->allParamsTypeOptions = array_merge($lang->api->paramsTypeOptions, $lang->api->paramsTypeCustomOptions);
 $lang->api->requiredOptions      = array(0 => 'No', 1 => 'Yes');
@@ -190,4 +197,4 @@ $lang->doclib->name = 'Interface Library Name';
 
 $lang->api->error = new stdclass();
 $lang->api->error->onlySelect = 'SQL interface only allow SELECT query.';
-$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
+$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';

module/api/lang/zh-cn.php

@@ -21,6 +21,7 @@ $lang->api->deleteLib        = '删除接口库';
 $lang->api->publish          = '发布接口';
 $lang->api->createLib        = '创建接口库';
 $lang->api->createApi        = '创建接口';
+$lang->api->createAB         = '创建';
 $lang->api->edit             = '编辑接口';
 $lang->api->delete           = '删除接口';
 $lang->api->position         = '位置';
@@ -56,6 +57,19 @@ $lang->api->confirmDeleteLib = "您确定删除该接口库吗？";
 $lang->api->filterStruct     = "使用数据结构填充";
 $lang->api->defaultVersion   = "当前版本";
 
+$lang->api->whiteList          = '白名单';
+$lang->api->aclList['open']    = '公开';
+$lang->api->aclList['private'] = '私有';
+$lang->api->aclList['custom']  = '自定义';
+$lang->api->group              = '分组';
+$lang->api->user               = '用户';
+
+$lang->api->noticeAcl = array(
+    'open'    => '所有人都可以访问',
+    'custom'  => '白名单的用户可以访问',
+    'private' => '只有创建者自己可以访问',
+);
+
 /* fields of struct */
 $lang->struct = new stdClass();
 
@@ -84,6 +98,7 @@ $lang->api->structAddedBy      = '创建人';
 $lang->api->structAddedDate    = '创建时间';
 $lang->api->name               = '接口库名称';
 $lang->api->baseUrl            = '请求基路径';
+$lang->api->baseUrlDesc        = '网址或者路径，比如 test.zentao.net 或者 /v1';
 $lang->api->desc               = '描述';
 $lang->api->control            = '访问控制';
 $lang->api->noLib              = '暂时没有接口库。';
@@ -166,11 +181,13 @@ $lang->api->paramsTypeOptions = array(
     'double'   => 'double',
     'decimal'  => 'decimal'
 );
+
 /* Api params */
 $lang->api->paramsTypeCustomOptions = array(
     'file' => 'file',
     'ref'  => 'ref',
 );
+
 $lang->api->structParamsOptons   = array_merge($lang->api->paramsTypeOptions, array('file' => 'file', 'ref' => 'ref'));
 $lang->api->allParamsTypeOptions = array_merge($lang->api->paramsTypeOptions, $lang->api->paramsTypeCustomOptions);
 $lang->api->requiredOptions      = array(0 => '否', 1 => '是');

module/api/view/create.html.php

@@ -41,7 +41,7 @@ js::set('struct_paramsType', $lang->struct->paramsType);
         <table class='table table-form'>
           <tbody>
             <tr>
-              <td> <?php echo html::select('filter', $allStruct, '', "class='form-control chosen filterSelect'");?> </td>
+              <td><?php echo html::select('filter', $allStruct, '', "class='form-control chosen filterSelect'");?></td>
               <td></td>
             </tr>
           </tbody>

module/api/view/createlib.html.php

@@ -28,24 +28,24 @@
             </tr>
             <tr>
               <th><?php echo $lang->api->baseUrl?></th>
-              <td style="width: 80%"><?php echo html::input('baseUrl', '', "class='form-control'")?></td>
+              <td style="width: 80%"><?php echo html::input('baseUrl', '', "class='form-control' placeholder='" . $lang->api->baseUrlDesc . "'");?></td>
             </tr>
             <tr>
               <th><?php echo $lang->api->control;?></th>
               <td>
-                <span><?php echo html::radio('acl', $lang->acl->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></span>
-                <span class='text-info' id='noticeAcl'><?php echo $lang->noticeAcl['open'];?></span>
+                <span><?php echo html::radio('acl', $lang->api->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></span>
+                <span class='text-info' id='noticeAcl'><?php echo $lang->api->noticeAcl['open'];?></span>
               </td>
             </tr>
             <tr id='whiteListBox' class='hidden'>
-              <th><?php echo $lang->acl->whiteList;?></th>
+              <th><?php echo $lang->api->whiteList;?></th>
               <td>
                 <div class='input-group'>
-                  <span class='input-group-addon groups-addon'><?php echo $lang->acl->group?></span>
+                  <span class='input-group-addon groups-addon'><?php echo $lang->api->group?></span>
                     <?php echo html::select('groups[]', $groups, '', "class='form-control chosen' multiple")?>
                 </div>
                 <div class='input-group'>
-                  <span class='input-group-addon'><?php echo $lang->acl->user?></span>
+                  <span class='input-group-addon'><?php echo $lang->api->user?></span>
                     <?php echo html::select('users[]', $users, '', "class='form-control chosen' multiple")?>
                 </div>
               </td>
@@ -77,5 +77,5 @@
     </tr>
   </table>
 </div>
-<?php js::set('noticeAcl', $lang->noticeAcl);?>
+<?php js::set('noticeAcl', $lang->api->noticeAcl);?>
 <?php include '../../common/view/footer.lite.html.php';?>

module/api/view/editlib.html.php

@@ -33,12 +33,12 @@
             <tr>
               <th><?php echo $lang->api->control;?></th>
               <td>
-                <span><?php echo html::radio('acl', $lang->acl->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></span>
-                <span class='text-info' id='noticeAcl'><?php echo $lang->noticeAcl['open'];?></span>
+                <span><?php echo html::radio('acl', $lang->api->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></span>
+                <span class='text-info' id='noticeAcl'><?php echo $lang->api->noticeAcl['open'];?></span>
               </td>
             </tr>
             <tr id='whiteListBox' class='hidden'>
-              <th><?php echo $lang->acl->whiteList;?></th>
+              <th><?php echo $lang->api->whiteList;?></th>
               <td>
                 <div class='input-group'>
                   <span class='input-group-addon groups-addon'><?php echo $lang->acl->group?></span>
@@ -75,11 +75,9 @@
     </tr>
     <tr id='aclBoxB'>
       <th><?php echo $lang->api->control;?></th>
-      <td>
-          <?php echo html::radio('acl', $lang->api->aclListB, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?>
-      </td>
+      <td><?php echo html::radio('acl', $lang->api->aclListB, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></td>
     </tr>
   </table>
 </div>
-<?php js::set('noticeAcl', $lang->noticeAcl);?>
+<?php js::set('noticeAcl', $lang->api->noticeAcl);?>
 <?php include '../../common/view/footer.lite.html.php';?>

module/common/lang/zh-cn.php

@@ -320,25 +320,6 @@ $lang->themes['pink']       = '芙蕖粉';
 $lang->themes['blackberry'] = '露莓黑';
 $lang->themes['classic']    = '经典蓝';
 
-/* global access control lang */
-/* common access control lang */
-$lang->acl->whiteList          = '白名单';
-$lang->acl->aclList['open']    = '公开';
-$lang->acl->aclList['private'] = '私有';
-$lang->acl->aclList['custom']  = '自定义';
-$lang->acl->group              = '分组';
-$lang->acl->user               = '用户';
-
-$lang->noticeAcl = [
-    'open'    => '所有人都可以访问',
-    'custom'  => '白名单的用户可以访问',
-    'private' => '只有创建者自己可以访问',
-];
-
-/* 全局公众配置 */
-$lang->curd->create = '创建';
-
-
 /* 错误提示信息。*/
 $lang->error                  = new stdclass();
 $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。";