diff --git a/interface/ri_data.py b/interface/ri_data.py index 1ae9ef8..f8933bd 100644 --- a/interface/ri_data.py +++ b/interface/ri_data.py @@ -409,7 +409,7 @@ p_node - xml node (parent node)''' return Raid.get_size(dev) @staticmethod - def is_check_data(dev,dr,fs): + def check_data(dev,dr,fs): '''check mount point is feasible. dr is mount point, dev is device''' # check mount point is existent or not if dr and dr in [ m.directory for m in MountPoint.dict.values() if m.device !=dev ]: diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index 1fac652..8f286c7 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -66,7 +66,6 @@ def mp_top_init(): def mp_top_ok(): ''' mount dir top window OK ''' l = [] - isdir_feasible = True for itm in eval(display.var_dict['mount.list'].get()): dev = itm.split()[0] dev2 = display.var_dict['mp_top_dev'].get() @@ -85,13 +84,13 @@ def mp_top_ok(): else: fs = ' ' - # check mount point is feasible - if ri_data.MountPoint.is_check_data(dev,dr,fs): + # check mount point is feasible or not + isdir_feasible = ri_data.MountPoint.check_data(dev,dr,fs) + if isdir_feasible: s2 = dev.ljust(10) + dr.ljust(10) + fs.ljust(10) + fm.ljust(4) + sz.ljust(6) + ri_data.Partition.unit ri_data.MountPoint.change(dev, dr, fs, fm) l.append(s2) else: - isdir_feasible=False l.append(itm) else: l.append(itm) diff --git a/xml/interface.xml b/xml/interface.xml index 7bbd981..1d4a001 100644 --- a/xml/interface.xml +++ b/xml/interface.xml @@ -858,7 +858,7 @@ row 4 | | - The mount point has been used or the mount point is special, dosen't mount it, plase look help information! + The mount point couldn't be mounted on because it has been used or it's particular. Plase read help infomation! 挂载点已经被使用或者这个是一个特殊的挂载点, 不能这样挂载, 请看帮助文档 @@ -947,24 +947,24 @@ row 4 | | - When make a raid0 or raid1, the partitions on the active display frame, must be more than one! + Making a raid0 or raid1 needs two or more partitions. 当制作raid0或raid1时,硬盘分区必须两个或两个以上。 - When make a raid5, the partitions on the active display frame, must be more than two! + Making a raid5 needs three or more partitions 当制作raid5的时,硬盘分区必须三个或三个以上。 - When adding a raid device, active list can not be null, and one raid level must be selected! + If you want to make a raid, you should choose a level of raid, and the active device list mustn't be null. 当添加raid设备时,使用设备列表不能为空,并且必须选定一个raid级别。 - You can not delete an existing raid, which is not made by I (install program)! + An existing raid, which wasn't made during this installation process, can't be deleted. 对于一个早已存在的raid设备(不是由安装程序创建的),你不能把它删除。 @@ -1045,7 +1045,7 @@ row 4 | | - installation Configuration is completed, press the OK button to start the installation + Installation configure finish. Press "ok" to start the installation. 安装配置完成,按确定键开始安装