aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-17 01:31:46 -0700
committerfriendica <info@friendica.com>2013-09-17 01:31:46 -0700
commit3354abfd428d1baef3d69886b75588163292aeae (patch)
tree7f68c75d3e784c704460e1f55f99a847317ef8d9
parent4335ef68d6e94d7e2ea8d8865c2c5bb0a60b483f (diff)
downloadvolse-hubzilla-3354abfd428d1baef3d69886b75588163292aeae.tar.gz
volse-hubzilla-3354abfd428d1baef3d69886b75588163292aeae.tar.bz2
volse-hubzilla-3354abfd428d1baef3d69886b75588163292aeae.zip
add -C cfgfile option to shred to allow multiple configurations. I just added the option for multiple configs, I didn't make it work as it requires quite a bit of change to the shred program flow; which tries to load the default config before doing anything at all.
-rw-r--r--doc/Developers.md4
-rwxr-xr-xutil/shred/shred5
-rw-r--r--version.inc2
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/Developers.md b/doc/Developers.md
index 074dda7af..e4905ccd1 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -16,6 +16,10 @@ to create and use your own tracking fork on github
Then go to your github page and create a "Pull request" when you are ready
to notify us to merge your work.
+**Translations**
+
+Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.
+
**Important**
Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
diff --git a/util/shred/shred b/util/shred/shred
index 113898ff9..2e463ac6d 100755
--- a/util/shred/shred
+++ b/util/shred/shred
@@ -43,6 +43,8 @@ OPTIONS:
-h Show this message
-c Command
+
+ -C Config-Filename
Valid Commands:
statuses_update
@@ -141,7 +143,6 @@ load_config () {
}
main () {
- load_config
fcli_command=
fcli_status=
@@ -152,6 +153,7 @@ main () {
do
case $name in
c) fcli_command="$OPTARG";;
+ C) FCLI_RC="$OPTARG";;
s) fcli_status="$OPTARG";;
r) fcli_in_reply_to_status_id="$OPTARG";;
f) fcli_file="$OPTARG";;
@@ -160,6 +162,7 @@ main () {
exit 2;;
esac
done
+ load_config
if [[ "$fcli_help_flag" == "1" ]]; then case $fcli_command in
statuses_update)
diff --git a/version.inc b/version.inc
index 186ac999c..44ebbfe27 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-09-16.438
+2013-09-17.439