Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
dbfbd3b8
Commit
dbfbd3b8
authored
Apr 13, 2012
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move end user stuff to examples dir
parent
a1809055
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
docs/admin.rst
docs/admin.rst
+2
-2
docs/install.rst
docs/install.rst
+1
-1
examples/apache.conf
examples/apache.conf
+2
-2
examples/django.wsgi
examples/django.wsgi
+0
-0
examples/git-merge-gettext-po
examples/git-merge-gettext-po
+0
-0
weblate.spec
weblate.spec
+3
-3
No files found.
docs/admin.rst
View file @
dbfbd3b8
...
...
@@ -88,14 +88,14 @@ source. You can either use hooks (see :ref:`hooks`) or just regularly run
With Gettext po files, you might be often bitten by conflict in PO file
headers. To avoid it, you can use shipped merge driver
(:file:`
script
s/git-merge-gettext-po`). To use it just put following
(:file:`
example
s/git-merge-gettext-po`). To use it just put following
configuration to your :file:`.gitconfig`:
.. code-block:: ini
[merge "merge-gettext-po"]
name = merge driver for gettext po files
driver = /path/to/weblate/
script
s/git-merge-gettext-po %O %A %B
driver = /path/to/weblate/
example
s/git-merge-gettext-po %O %A %B
And enable it's use by defining proper attributes in given repository (eg. in
:file:`.git/info/attribute`)::
...
...
docs/install.rst
View file @
dbfbd3b8
...
...
@@ -93,7 +93,7 @@ Sample configuration for Apache
Following configuration runs Weblate as WSGI, you need to have enable
mod_wsgi:
.. literalinclude:: ../
script
s/apache.conf
.. literalinclude:: ../
example
s/apache.conf
.. _appliance:
...
...
script
s/apache.conf
→
example
s/apache.conf
View file @
dbfbd3b8
...
...
@@ -29,12 +29,12 @@
Allow
from
all
</
Directory
>
<
Directory
/
usr
/
share
/
weblate
/
script
s
/>
<
Directory
/
usr
/
share
/
weblate
/
example
s
/>
Order
deny
,
allow
Allow
from
all
</
Directory
>
WSGIScriptAlias
/ /
usr
/
share
/
weblate
/
script
s
/
django
.
wsgi
WSGIScriptAlias
/ /
usr
/
share
/
weblate
/
example
s
/
django
.
wsgi
WSGIPassAuthorization
On
</
VirtualHost
>
script
s/django.wsgi
→
example
s/django.wsgi
View file @
dbfbd3b8
File moved
script
s/git-merge-gettext-po
→
example
s/git-merge-gettext-po
View file @
dbfbd3b8
File moved
weblate.spec
View file @
dbfbd3b8
...
...
@@ -53,8 +53,8 @@ List of features includes:
make -C docs html
sed -i 's@^WEB_ROOT = .*@WEB_ROOT = "%{WLDIR}"@g' settings.py
sed -i 's@^WHOOSH_INDEX = .*@WHOOSH_INDEX = "%{WLDATADIR}"@g' settings.py
sed -i 's@/usr/lib/python.*/site-packages@%{python_sitelib}@g'
script
s/apache.conf
sed -i 's@weblate-path@%{WLDIR}@g'
script
s/django.wsgi
sed -i 's@/usr/lib/python.*/site-packages@%{python_sitelib}@g'
example
s/apache.conf
sed -i 's@weblate-path@%{WLDIR}@g'
example
s/django.wsgi
%install
install -d %{buildroot}/%{WLDIR}
...
...
@@ -79,7 +79,7 @@ ln -s %{WLETCDIR}/settings.py %{buildroot}/%{WLDIR}/settings.py
# Apache config
install -d %{buildroot}/%{_sysconfdir}/apache2/vhosts.d/
install -m 644
script
s/apache.conf %{buildroot}/%{_sysconfdir}/apache2/vhosts.d/weblate.conf
install -m 644
example
s/apache.conf %{buildroot}/%{_sysconfdir}/apache2/vhosts.d/weblate.conf
# Whoosh index dir
install -d %{buildroot}/%{WLDATADIR}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment