Skip to content

Commit 11f84b7

Browse files
barijaonabarijaona
committed
Merge pull request #273 from barijaona/TheOldReader
Support TheOldReader.com
2 parents 9fb2b2b + 2b176b2 commit 11f84b7

25 files changed

+257
-43
lines changed

‎Vienna.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2979,13 +2979,13 @@
29792979
path = lproj/zh_TW.lproj;
29802980
sourceTree = SOURCE_ROOT;
29812981
};
2982-
660AA30914072BFD0082CCF0 /* Google Reader Sync */ = {
2982+
660AA30914072BFD0082CCF0 /* OpenReader Sync */ = {
29832983
isa = PBXGroup;
29842984
children = (
29852985
664F87C513C62DFE00E266DE /* GoogleReader.h */,
29862986
664F87C613C62DFE00E266DE /* GoogleReader.m */,
29872987
);
2988-
name = "Google Reader Sync";
2988+
name = "OpenReader Sync";
29892989
sourceTree = SOURCE_ROOT;
29902990
};
29912991
6624689213C6063200C85417 /* ASIHTTPRequest */ = {
@@ -3211,7 +3211,7 @@
32113211
AAA568BB09EE773200C87343 /* Vienna */ = {
32123212
isa = PBXGroup;
32133213
children = (
3214-
660AA30914072BFD0082CCF0 /* Google Reader Sync */,
3214+
660AA30914072BFD0082CCF0 /* OpenReader Sync */,
32153215
AAA5687609EE72BE00C87343 /* NewsParser */,
32163216
AA4F657B062B873100D4837C /* Extensions */,
32173217
AA8C76C006420CA800649BA2 /* Database */,

‎lproj/cs.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Jiná</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/da.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Andet</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/de.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Aüswählen</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/en.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Other</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/es.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Otros</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/eus.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Besteak</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/fr.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Entrez le nom d'utilisateur et le mot de passe de votre compte InoReader</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Entrez le nom d'utilisateur et le mot de passe définis dans la section Réglage/Général du site theoldreader.com</string>
32+
</dict>
2633
<key>Autre</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/it.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Altro</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/ja.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>その他</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/ko.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>선택</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/nl.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Andere</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/pt.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Outro</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/pt_BR.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Outro</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/ru.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Иное</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/sv.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Annan</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/tr.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Diğer</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/uk.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>Інше</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/zh_CN.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>其他</key>
2734
<dict>
2835
<key>Address</key>

‎lproj/zh_TW.lproj/KnownSyncServers.plist

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<key>Hint</key>
2424
<string>Enter username and password associated to your InoReader account</string>
2525
</dict>
26+
<key>TheOldReader</key>
27+
<dict>
28+
<key>Address</key>
29+
<string>theoldreader.com</string>
30+
<key>Hint</key>
31+
<string>Enter username and password defined in Settings/General section of theoldreader.com</string>
32+
</dict>
2633
<key>其他</key>
2734
<dict>
2835
<key>Address</key>

‎src/Folder.m

+2-10
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,7 @@ -(NSImage *)image
361361
if ([self feedURL])
362362
{
363363
NSString * homePageSiteRoot;
364-
if (IsRSSFolder(self)) {
365-
homePageSiteRoot = [[[self homePage] host] convertStringToValidPath];
366-
} else {
367-
homePageSiteRoot = [[[self feedURL] host] convertStringToValidPath];
368-
}
364+
homePageSiteRoot = [[[self homePage] host] convertStringToValidPath];
369365
imagePtr = [[FolderImageCache defaultCache] retrieveImage:homePageSiteRoot];
370366
}
371367
NSImage *altIcon;
@@ -418,11 +414,7 @@ -(void)setImage:(NSImage *)iconImage
418414
if ([self feedURL] != nil && iconImage != nil)
419415
{
420416
NSString * homePageSiteRoot;
421-
if (IsRSSFolder(self)) {
422-
homePageSiteRoot = [[[self homePage] host] convertStringToValidPath];
423-
} else { //GoogleReader
424-
homePageSiteRoot = [[[self feedURL] host] convertStringToValidPath];
425-
}
417+
homePageSiteRoot = [[[self homePage] host] convertStringToValidPath];
426418
[[FolderImageCache defaultCache] addImage:iconImage forURL:homePageSiteRoot];
427419
}
428420
}

0 commit comments

Comments
 (0)