* fix react proptypes

* Replace the handle field and label with url

* Update rename channel url correctly

* fix merge

* fix after test-1

* update i18n
Этот коммит содержится в:
fengpan
2017-02-17 21:58:39 +08:00
коммит произвёл Joram Wilander
родитель 26e44d9b32
Коммит b3afe9fb16
7 изменённых файлов: 50 добавлений и 31 удалений

Просмотреть файл

@@ -1730,7 +1730,7 @@
"rename_channel.defaultError": " - Cannot be changed for the default channel",
"rename_channel.displayName": "Display Name",
"rename_channel.displayNameHolder": "Enter display name",
"rename_channel.handle": "Handle",
"rename_channel.url": "URL",
"rename_channel.handleHolder": "lowercase alphanumeric's only",
"rename_channel.lowercase": "Must be lowercase alphanumeric characters",
"rename_channel.maxLength": "This field must be less than 22 characters",

Просмотреть файл

@@ -1730,7 +1730,7 @@
"rename_channel.defaultError": "-不能改变默认频道",
"rename_channel.displayName": "显示名称",
"rename_channel.displayNameHolder": "输入显示名",
"rename_channel.handle": "识别名",
"rename_channel.url": "链接地址",
"rename_channel.handleHolder": "小写字母数字#39;只有",
"rename_channel.lowercase": "必须小写字母数字字符",
"rename_channel.maxLength": "这个字段必须少于22个字符",

Просмотреть файл

@@ -1730,7 +1730,7 @@
"rename_channel.defaultError": " - 預設頻道不能更改",
"rename_channel.displayName": "顯示名稱",
"rename_channel.displayNameHolder": "請輸入顯示名稱",
"rename_channel.handle": "識別名",
"rename_channel.url": "鏈接地址",
"rename_channel.handleHolder": "僅限小寫英數字",
"rename_channel.lowercase": "請用小寫英數字",
"rename_channel.maxLength": "此欄位必須少於22個字元",