|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/VeggieSailor/harbour-veggiesailor-releases.git</param>
<param name="branch">master</param>
- <param name="revision">41298615a481fb8eaee85fd1d255e78d5f03a2aa</param>
+ <param name="revision">55db18957054b3913e1dfddb60bf52bcb0436480</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/.gitignore
^
|
| @@ -2,3 +2,4 @@
*kdev4
*__pycache__
*.pyc
+rpm/harbour-veggiesailor.spec.*
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/pyveggiesailor/controller.py
^
|
| @@ -82,6 +82,7 @@
try:
return entry['images'][0]['files'][1]['uri'].replace('https','http')
except KeyError:
+ # No image in the entry
return ''
@@ -108,7 +109,7 @@
def get_root():
"""Get root VegGuide regions data tree.
"""
- root = VGOCache('https://www.vegguide.org/')
+ root = VGOCache('https://www.vegguide.org/region/0')
return check_has_regions(root.results['regions']['primary'])
def get_children(uri):
@@ -200,27 +201,28 @@
from vegguide import VegGuideObject
from pprint import PrettyPrinter
p = PrettyPrinter()
- p.pprint(get_entry('http://www.vegguide.org/entry/20647'))
+ get_entry_image('http://www.vegguide.org/entry/12190')
+# p.pprint(get_entry('http://www.vegguide.org/entry/20647'))
-# get_root()
+## get_root()
-# root = VGOCache('https://www.vegguide.org/')
-# print(get_root())
-# europe = VGOCache('https://www.vegguide.org/region/52')
-# spain2 = VGOCache('https://www.vegguide.org/region/66')
-# print(get_children('https://www.vegguide.org/region/53'))
-# print(get_children('https://www.vegguide.org/region/2006'))
- giblartar = VGOCache('https://www.vegguide.org/region/2236')
+## root = VGOCache('https://www.vegguide.org/')
+## print(get_root())
+## europe = VGOCache('https://www.vegguide.org/region/52')
+## spain2 = VGOCache('https://www.vegguide.org/region/66')
+## print(get_children('https://www.vegguide.org/region/53'))
+## print(get_children('https://www.vegguide.org/region/2006'))
+# giblartar = VGOCache('https://www.vegguide.org/region/2236')
- bcn = VGOCache('http://www.vegguide.org/entry/12190')
- bar = VGOCache('https://www.vegguide.org/entry/12300')
+# bcn = VGOCache('http://www.vegguide.org/entry/12190')
+# bar = VGOCache('https://www.vegguide.org/entry/12300')
- reviews = get_reviews('http://www.vegguide.org/entry/12190/reviews')
+# reviews = get_reviews('http://www.vegguide.org/entry/12190/reviews')
# p.pprint(bar.results)
-# print(get_entry_image('http://www.vegguide.org/entry/20647'))
+
# print(get_entries('http://www.vegguide.org/region/583'))
# http://www.vegguide.org/entry/20647
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/pyveggiesailor/veggiesailor.py
^
|
| @@ -104,7 +104,7 @@
except FileNotFoundError:
init_cache_dir()
-if not check_version_stamp(3):
+if not check_version_stamp(4):
purge_all_cache()
class Cache(object):
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/pyveggiesailor/vegguide.py
^
|
| @@ -41,7 +41,7 @@
return {
'type':'entry',
'source_id':source_id,
- 'proxy_uri':'%s/region/%s' % (VS_BASE_URL, source_id)
+ 'proxy_uri':'%s/entry/%s' % (VS_BASE_URL, source_id)
}
elif reviews_regexp.match(self.uri):
@@ -53,9 +53,6 @@
}
return {'type':'error','source_id':-1, 'proxy_uri':None}
-
-
-
class VegGuideParser:
def __init__(self, vegguide_request):
req = request.urlopen(vegguide_request)
@@ -132,6 +129,9 @@
self.vgo_id = uri.replace('https://www.vegguide.org/', '')
self.parent = parent
+
+
+
if payload_json == None:
if vegbasket_cache:
req = VegGuideProxyRequest(self.uri)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/qml/pages/Reviews.qml
^
|
| @@ -40,11 +40,7 @@
width: Theme.paddingLarge * 3
source: user_image
height: Theme.paddingLarge * 3
-
-
}
-
-
Label {
id: label
text: user['name']
@@ -64,9 +60,7 @@
}
Repeater {
id: repeater_rating
-
model: rating
-
Image
{
source: "image://theme/icon-m-favorite-selected"
@@ -99,16 +93,9 @@
font.pixelSize: Theme.fontSizeSmall
wrapMode: Text.WordWrap
width: parent.width - Theme.paddingLarge * 4
-
-
-
}
-
-
}
-
}
-
BusyIndicator {
anchors.centerIn: parent
size: BusyIndicatorSize.Large
@@ -130,12 +117,6 @@
// console.log(JSON.stringify(data));
for (var i=0; i<data.length; i++) {
listModel.append(data[i]);
-
-
-
-
-
-
}
loadingData = false;
}
|
|
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_da.qm
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_da.ts
^
|
| @@ -12,7 +12,7 @@
<message>
<location filename="../qml/cover/CoverPage.qml" line="37"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
</context>
<context>
@@ -25,7 +25,7 @@
<message>
<location filename="../qml/pages/Credits.qml" line="16"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
<message>
<location filename="../qml/pages/Credits.qml" line="45"/>
@@ -113,7 +113,7 @@
<message>
<location filename="../qml/pages/FirstPage.qml" line="43"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
<message>
<location filename="../qml/pages/FirstPage.qml" line="104"/>
|
|
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_fi.qm
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_fi.ts
^
|
| @@ -12,7 +12,7 @@
<message>
<location filename="../qml/cover/CoverPage.qml" line="37"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
</context>
<context>
@@ -25,7 +25,7 @@
<message>
<location filename="../qml/pages/Credits.qml" line="16"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
<message>
<location filename="../qml/pages/Credits.qml" line="45"/>
@@ -113,7 +113,7 @@
<message>
<location filename="../qml/pages/FirstPage.qml" line="43"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
<message>
<location filename="../qml/pages/FirstPage.qml" line="104"/>
|
|
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_it.qm
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_it.ts
^
|
| @@ -12,7 +12,7 @@
<message>
<location filename="../qml/cover/CoverPage.qml" line="37"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
</context>
<context>
@@ -25,7 +25,7 @@
<message>
<location filename="../qml/pages/Credits.qml" line="16"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
<message>
<location filename="../qml/pages/Credits.qml" line="45"/>
@@ -113,7 +113,7 @@
<message>
<location filename="../qml/pages/FirstPage.qml" line="43"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"/>
+ <translation>Veggie Sailor</translation>
</message>
<message>
<location filename="../qml/pages/FirstPage.qml" line="104"/>
|
|
|
Added |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_ru.qm
^
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-veggiesailor-0.8.4.tar.bz2/translations/harbour-veggiesailor_ru.ts
^
|
| @@ -0,0 +1,220 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
+<context>
+ <name>ChooseMinimumVegLevel</name>
+ <message>
+ <location filename="../qml/pages/ChooseMinimumVegLevel.qml" line="30"/>
+ <source>Minimum Veggie-Level</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>CoverPage</name>
+ <message>
+ <location filename="../qml/cover/CoverPage.qml" line="37"/>
+ <source>Veggie Sailor</source>
+ <translation>Veggie Sailor</translation>
+ </message>
+</context>
+<context>
+ <name>Credits</name>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="12"/>
+ <source>Credits</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="16"/>
+ <source>Veggie Sailor</source>
+ <translation>Veggie Sailor</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="45"/>
+ <source>If you like the app - please support us, we need developers, translators, content editors and more :)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Entries</name>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="23"/>
+ <location filename="../qml/pages/Entries.qml" line="35"/>
+ <source>Add to favorites</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="31"/>
+ <source>Remove from favorites</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="43"/>
+ <source>Minimum Veggie-Level</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="56"/>
+ <source>At least %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>EntryMap</name>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="34"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="40"/>
+ <source>Phone</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Fav</name>
+ <message>
+ <location filename="../qml/pages/Fav.qml" line="40"/>
+ <source>Favourites</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/Fav.qml" line="49"/>
+ <source>Places</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/Fav.qml" line="95"/>
+ <source>Cities</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>FirstPage</name>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="12"/>
+ <source>Clear cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="17"/>
+ <source>Credits</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="21"/>
+ <source>Sail</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="25"/>
+ <source>Favorites</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="43"/>
+ <source>Veggie Sailor</source>
+ <translation>Veggie Sailor</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="104"/>
+ <source>Powered by VegGuide.org</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>PlaceInfo</name>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="42"/>
+ <source>Add to favorites</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="115"/>
+ <source>Veg Level</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="140"/>
+ <source>Map</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="165"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="181"/>
+ <source>Phone</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="203"/>
+ <source>Information</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="211"/>
+ <source>Description</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="216"/>
+ <source>Price Range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="221"/>
+ <source>Hours</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="226"/>
+ <source>Cuisines</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="231"/>
+ <source>Tags</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="256"/>
+ <source>Reviews</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>VegLevel</name>
+ <message>
+ <location filename="../qml/VegLevel.js" line="3"/>
+ <source>Show all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/VegLevel.js" line="4"/>
+ <source>Vegetarian-Friendly</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/VegLevel.js" line="5"/>
+ <source>Vegan-Friendly</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/VegLevel.js" line="6"/>
+ <source>Vegetarian (But Not Vegan-Friendly)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/VegLevel.js" line="7"/>
+ <source>Vegetarian</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qml/VegLevel.js" line="8"/>
+ <source>Vegan</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-veggiesailor
Summary: Veggie Sailor
-Version: 0.8.3
+Version: 0.8.4
Release: 1
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
|
