Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

master
Joey Hess 2007-11-05 19:33:56 -05:00
commit c1e4bed9d6
4 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,15 @@
It seems like gettext only searches for locale information in /usr/share/locale, by default. I installed ikiwiki into /usr/local, therefore the locale information wasn't found. This patch fixes the issue:
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1057,6 +1057,7 @@ sub gettext { #{{{
$gettext_obj=undef;
return shift;
}
+ $gettext_obj->dir("$installdir/share/locale/");
}
return $gettext_obj->get(shift);
}
[[tag patch]]
-- [[ThomasBleher]]

View File

@ -1,7 +1,7 @@
Quick poll: Do you feel that ikiwiki is fast enough on this server, or
should I move it to my much beefier auxillary server?
[[poll 27 "It's fast enough" 4 "It's too slow!" 3 "No opinion"]]
[[poll 33 "It's fast enough" 4 "It's too slow!" 4 "No opinion"]]
If you have specifics on performance issues, you might mention them on the
[[discussion]] page.

View File

@ -8,7 +8,7 @@ Aggregate a feed as follows
feedurl="http://example.com/index.rss"
url="http://example.com/" updateinterval="15"]]
That example aggregates posts from the expecified RSS feed, updating no
That example aggregates posts from the specified RSS feed, updating no
more frequently than once every 15 minutes, and puts a page per post under
the example/ directory in the wiki.

View File

@ -1,3 +1,5 @@
# Adaptation to Newer Versions of ikiwiki
I tried using this plugin, but to no success so far. I used *gallery* git branch,
rebased it onto the *origin/master*, built a Debian package and installed that one.
@ -29,3 +31,15 @@ New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gal
--[[arpitjain]]
# Bug With Referring to *js* and *css* Files
In the generated files `gallery/index/index.html` and `gallery/index/*/gallery_*`
it should not be referred to `/js` but to `../../js` and `../../../js`, respectively.
Likewise for `/css`.
# All Thumbnails on One Page
Could `rows="0"` be used to state that all thumbnails should be put on the same page,
no matter how much there are?