kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Crowdin] string fix + misc. typo and whitespace fixes

Browse Source 
* Crowdin link: https://crowdin.com/translate/freecad/6766/en-hu#6576162  
* Tacked on a few typo+whitespace fixes
This commit is contained in:
luz.paz
2019-06-20 02:58:39 -04:00
committed by wmayer
parent 46d1095816
commit c2827611be
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Tools/SubWCRev.py
View File

@@ -4,8 +4,8 @@
#
# FreeCAD RevInfo script to get the revision information from Subversion, Bazaar, and Git.
#
# Under Linux the Subversion tool SubWCRev shipped with TortoiseSVN isn't
# available which is provided by this script.
# Under Linux the Subversion tool SubWCRev shipped with TortoiseSVN isn't
# available which is provided by this script.
# 2012/02/01: The script was extended to support git
# 2011/02/05: The script was extended to support also Bazaar
@@ -33,7 +33,7 @@ class SvnHandler(xml.sax.handler.ContentHandler):
self.inUrl = 1
elif name == "date":
self.inDate = 1
def characters(self, data):
if self.inUrl:
self.buffer += data
@@ -98,7 +98,7 @@ class DebianChangelog(VersionControl):
r=re.search("bzr(\\d+)",c)
if r != None:
self.rev = r.groups()[0] + " (Launchpad)"
t = time.localtime()
self.date = ("%d/%02d/%02d %02d:%02d:%02d") % (t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec)
self.url = "https://code.launchpad.net/~vcs-imports/freecad/trunk"
@@ -175,11 +175,10 @@ class GitControl(VersionControl):
def revisionNumber(self, srcdir,origin=None):
"""sets the revision number
for master and release branches all commits are counted
for other branches the version numver is split in two parts
the first number reflects the number of commits in common with the
blessed master repository.
the second part, separated by " +" reflects the number of commits that are
different from the master repository"""
for other branches. The version number is split in to two parts:
The first number reflects the number of commits in common with the
blessed master repository. The second part (separated by " +") reflects
the number of commits that are different from the master repository"""
referencecommit="7d8e53aaab17961d85c5009de34f69f2af084e8b"
referencerevision=14555
@@ -246,7 +245,7 @@ class GitControl(VersionControl):
float(info.strip().split(' ',1)[0])))
for self.branch in os.popen("git branch --no-color").read().split('\n'):
if re.match( "\*", self.branch ) != None:
break
break
self.branch=self.branch[2:]
self.getremotes() #setup self.remotes and branchlst
@@ -275,7 +274,7 @@ class GitControl(VersionControl):
self.branch = '(%s)' % \
os.popen("git describe --all --dirty").read().strip()
#if the branch name contained any slashes but was not a remote
#there might be not result by now. Hence we assume origin
#there might be no result by now. Hence we assume origin
if self.url == "Unknown":
for i in info:
r = re.match("origin\\W+(\\S+)",i)
@@ -393,4 +392,3 @@ def main():
if __name__ == "__main__":
main()