Merge branch 'master' of github.com:jeena/Bungloo
This commit is contained in:
commit
a9ad87e5b2
3 changed files with 5 additions and 5 deletions
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
BSD license
|
BSD license
|
||||||
===========
|
===========
|
||||||
|
|
||||||
|
@ -13,7 +12,7 @@ modification, are permitted provided that the following conditions are met:
|
||||||
- Redistributions in binary form must reproduce the above copyright notice,
|
- Redistributions in binary form must reproduce the above copyright notice,
|
||||||
this list of conditions and the following disclaimer in the documentation
|
this list of conditions and the following disclaimer in the documentation
|
||||||
and/or other materials provided with the distribution.
|
and/or other materials provided with the distribution.
|
||||||
- Neither the name of Twittia nor the names of its contributors may
|
- Neither the name of Bungloo nor the names of its contributors may
|
||||||
be used to endorse or promote products derived from this software without
|
be used to endorse or promote products derived from this software without
|
||||||
specific prior written permission.
|
specific prior written permission.
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,8 @@ class Controller(QtCore.QObject):
|
||||||
QtCore.QObject.__init__(self)
|
QtCore.QObject.__init__(self)
|
||||||
self.app = app
|
self.app = app
|
||||||
|
|
||||||
os.path.expanduser("~/.bungloo/")
|
if not os.path.exists(os.path.expanduser("~/.bungloo/")):
|
||||||
|
os.makedirs(os.path.expanduser("~/.bungloo/"))
|
||||||
|
|
||||||
self.config_path = os.path.expanduser('~/.bungloo/bungloo.cfg')
|
self.config_path = os.path.expanduser('~/.bungloo/bungloo.cfg')
|
||||||
if os.access(self.config_path, os.R_OK):
|
if os.access(self.config_path, os.R_OK):
|
||||||
|
|
|
@ -49,7 +49,7 @@ function($) {
|
||||||
hour: "1h",
|
hour: "1h",
|
||||||
hours: "%dh",
|
hours: "%dh",
|
||||||
day: "1 day",
|
day: "1 day",
|
||||||
days: "%d day",
|
days: "%d days",
|
||||||
month: "1 month",
|
month: "1 month",
|
||||||
months: "%d months",
|
months: "%d months",
|
||||||
year: "1 year",
|
year: "1 year",
|
||||||
|
|
Reference in a new issue