| @@ -159,12 +159,12 @@ function getTime(UpdatedUnix,currentTime){ | |||||
| var seconds= leave3; | var seconds= leave3; | ||||
| if(hours == 0 && minutes == 0){ | if(hours == 0 && minutes == 0){ | ||||
| return seconds + getRepoOrOrg(6,isZh); | |||||
| return seconds + getRepoOrOrg(6,isZh,seconds); | |||||
| }else{ | }else{ | ||||
| if(hours > 0){ | if(hours > 0){ | ||||
| return hours + getRepoOrOrg(4,isZh); | |||||
| return hours + getRepoOrOrg(4,isZh,hours); | |||||
| }else{ | }else{ | ||||
| return minutes + getRepoOrOrg(5,isZh); | |||||
| return minutes + getRepoOrOrg(5,isZh,minutes); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -267,18 +267,30 @@ var repoAndOrgZH={ | |||||
| "1":"项目", | "1":"项目", | ||||
| "2":"成员", | "2":"成员", | ||||
| "3":"团队", | "3":"团队", | ||||
| "11":"项目", | |||||
| "21":"成员", | |||||
| "31":"团队", | |||||
| "4":"小时前", | "4":"小时前", | ||||
| "5":"分钟前", | "5":"分钟前", | ||||
| "6":"秒前" | |||||
| "6":"秒前", | |||||
| "41":"小时前", | |||||
| "51":"分钟前", | |||||
| "61":"秒前" | |||||
| }; | }; | ||||
| var repoAndOrgEN={ | var repoAndOrgEN={ | ||||
| "1":"repository", | |||||
| "2":"Members ", | |||||
| "3":"Teams", | |||||
| "4":" hours ago", | |||||
| "5":" minutes ago", | |||||
| "6":" seconds ago" | |||||
| "1":"Repository", | |||||
| "2":"Member ", | |||||
| "3":"Team", | |||||
| "11":"Repository", | |||||
| "22":"Member ", | |||||
| "31":"Team", | |||||
| "4":" hour ago", | |||||
| "5":" minute ago", | |||||
| "6":" second ago", | |||||
| "41":" hours ago", | |||||
| "51":" minutes ago", | |||||
| "61":" seconds ago" | |||||
| }; | }; | ||||
| @@ -409,7 +421,10 @@ function displayRepo(json){ | |||||
| //var repoAndOrgEN = new Map([['1', "Repository"], ['2', "Members"], ['3', "Teams"]]); | //var repoAndOrgEN = new Map([['1', "Repository"], ['2', "Members"], ['3', "Teams"]]); | ||||
| function getRepoOrOrg(key,isZhLang){ | |||||
| function getRepoOrOrg(key,isZhLang,numbers=1){ | |||||
| if(numbers > 1){ | |||||
| key+="1"; | |||||
| } | |||||
| if(isZhLang){ | if(isZhLang){ | ||||
| return repoAndOrgZH[key]; | return repoAndOrgZH[key]; | ||||
| }else{ | }else{ | ||||
| @@ -430,7 +445,7 @@ function displayOrg(json){ | |||||
| html += " <img class=\"ui image\" src=\"" + record["Avatar"] + "\">"; | html += " <img class=\"ui image\" src=\"" + record["Avatar"] + "\">"; | ||||
| html += " <div class=\"content nowrap\">"; | html += " <div class=\"content nowrap\">"; | ||||
| html += " <span class=\"ui blue\">" + record["Name"] + "</span> " + record["FullName"]; | html += " <span class=\"ui blue\">" + record["Name"] + "</span> " + record["FullName"]; | ||||
| html += " <div class=\"sub header\">" + record["NumRepos"] +" " + getRepoOrOrg(1,isZh) + " ・ " + record["NumMembers"] +" " + getRepoOrOrg(2,isZh) + " ・ " + record["NumTeams"] + " " + getRepoOrOrg(3,isZh) + "</div>"; | |||||
| html += " <div class=\"sub header\">" + record["NumRepos"] +" " + getRepoOrOrg(1,isZh,record["NumRepos"]) + " ・ " + record["NumMembers"] +" " + getRepoOrOrg(2,isZh,record["NumMembers"]) + " ・ " + record["NumTeams"] + " " + getRepoOrOrg(3,isZh,record["NumTeams"]) + "</div>"; | |||||
| html += " </div>"; | html += " </div>"; | ||||
| html += " </div>"; | html += " </div>"; | ||||
| html += " </div>"; | html += " </div>"; | ||||