perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui, script: Translate discovery popover and detect it in translate script

Browse Source 
Skip-check: pr-solaris

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4061
This commit is contained in:
Simon Frei 2017-03-25 11:56:51 +00:00 committed by Jakob Borg
parent ac46db78d7
commit 1ad547fb65
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/default/assets/lang/lang-en.json
View File

@ -30,6 +30,7 @@
"CPU Utilization": "CPU Utilization", "CPU Utilization": "CPU Utilization",
"Changelog": "Changelog", "Changelog": "Changelog",
"Clean out after": "Clean out after", "Clean out after": "Clean out after",
"Click to see discovery failures": "Click to see discovery failures",
"Close": "Close", "Close": "Close",
"Command": "Command", "Command": "Command",
"Comment, when used at the start of a line": "Comment, when used at the start of a line", "Comment, when used at the start of a line": "Comment, when used at the start of a line",

2
gui/default/index.html
View File

@ -511,7 +511,7 @@
<span>{{discoveryTotal}}/{{discoveryTotal}}</span> <span>{{discoveryTotal}}/{{discoveryTotal}}</span>
</span> </span>
<span ng-if="discoveryFailed.length != 0" class="data" ng-class="{'text-danger': discoveryFailed.length == discoveryTotal}"> <span ng-if="discoveryFailed.length != 0" class="data" ng-class="{'text-danger': discoveryFailed.length == discoveryTotal}">
<span popover data-trigger="hover" data-placement="bottom" data-content="Click to see discovery failures."> <span popover data-trigger="hover" data-placement="bottom" data-content="{{'Click to see discovery failures' | translate}}.">
<a href="" style="color:inherit" ng-click="showDiscoveryFailures()">{{discoveryTotal-discoveryFailed.length}}/{{discoveryTotal}}</a> <a href="" style="color:inherit" ng-click="showDiscoveryFailures()">{{discoveryTotal-discoveryFailed.length}}/{{discoveryTotal}}</a>
</span> </span>
</span> </span>

5
script/translate.go
View File

@ -50,6 +50,11 @@ func generalNode(n *html.Node, filename string) {
if matches := attrRe.FindStringSubmatch(a.Val); len(matches) == 2 { if matches := attrRe.FindStringSubmatch(a.Val); len(matches) == 2 {
translation(matches[1]) translation(matches[1])
} }
if a.Key == "data-content" &&
!noStringRe.MatchString(a.Val) {
log.Println("Untranslated data-content string (" + filename + "):")
log.Print("\t" + a.Val)
}
} }
} }
} }