From 160e2d8f0b1e4c3e9fe7f89300de22c5ef334833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 15 Jan 2016 16:07:57 +0100 Subject: some cleanup: * move capistrano config files * remove useless files --- .scrutinizer.yml | 1 + CREDITS.md | 4 +- Capfile | 22 ++------- GUIDELINES.md | 53 ---------------------- TRANSLATION.md | 67 ---------------------------- Vagrantfile | 71 ------------------------------ app/config/capistrano/deploy.rb | 23 ++++++++++ app/config/capistrano/deploy/production.rb | 0 app/config/capistrano/deploy/staging.rb | 2 + config/deploy.rb | 23 ---------- config/deploy/production.rb | 61 ------------------------- config/deploy/staging.rb | 2 - 12 files changed, 30 insertions(+), 299 deletions(-) delete mode 100644 GUIDELINES.md delete mode 100644 TRANSLATION.md delete mode 100644 Vagrantfile create mode 100644 app/config/capistrano/deploy.rb create mode 100644 app/config/capistrano/deploy/production.rb create mode 100644 app/config/capistrano/deploy/staging.rb delete mode 100644 config/deploy.rb delete mode 100644 config/deploy/production.rb delete mode 100644 config/deploy/staging.rb diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 8fbd8265..dee92922 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -4,6 +4,7 @@ filter: excluded_paths: - 'vendor/*' - 'app/*' + - 'var/*' - 'web/*' - 'src/Wallabag/*Bundle/Tests/*' - '*Test.php' diff --git a/CREDITS.md b/CREDITS.md index eb2096e0..c85924d0 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,5 +1,3 @@ -wallabag is mainly developed by [Nicolas LÅ“uillet](https://github.com/nicosomb) under the MIT License. - -Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r). +wallabag is mainly developed by [Nicolas LÅ“uillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License. Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors). diff --git a/Capfile b/Capfile index d3273469..b80a5646 100644 --- a/Capfile +++ b/Capfile @@ -1,3 +1,6 @@ +set :deploy_config_path, 'app/config/capistrano/deploy.rb' +set :stage_config_path, 'app/config/capistrano/deploy' + # Load DSL and set up stages require 'capistrano/setup' @@ -6,24 +9,5 @@ require 'capistrano/deploy' require 'capistrano/symfony' -# Include tasks from other gems included in your Gemfile -# -# For documentation on these, see for example: -# -# https://github.com/capistrano/rvm -# https://github.com/capistrano/rbenv -# https://github.com/capistrano/chruby -# https://github.com/capistrano/bundler -# https://github.com/capistrano/rails -# https://github.com/capistrano/passenger -# -# require 'capistrano/rvm' -# require 'capistrano/rbenv' -# require 'capistrano/chruby' -# require 'capistrano/bundler' -# require 'capistrano/rails/assets' -# require 'capistrano/rails/migrations' -# require 'capistrano/passenger' - # Load custom tasks from `lib/capistrano/tasks` if you have any defined Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } diff --git a/GUIDELINES.md b/GUIDELINES.md deleted file mode 100644 index 51e0de93..00000000 --- a/GUIDELINES.md +++ /dev/null @@ -1,53 +0,0 @@ -# Guidelines for wallabag - -If you want to contribute to wallabag, you have some rules to respect. These rules were defined by [PHP Framework Interop Group](http://www.php-fig.org). - -## Basic Coding Standard (PSR-1) - -This section of the standard comprises what should be considered the standard coding elements that are required to ensure a high level of technical interoperability between shared PHP code. - -* Files MUST use only `Preferences. Go to "Parsers" tab, click on PHP and press "Edit" button. Make sure your "Parser command:" looks like - -`xgettext --no-location --force-po -o %o %C %K %F` - -Usually it is required to add "--no-location" to default value. - -### 4. Open .po file you want to edit in Poedit and change its settings -Open, for example `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po` file in your Poedit. - -Go to "Catalog"->"Settings..." menu. Then go to "Path" tab and add path to wallabag installation in your local file system. This step can't be omitted as you will not be able to update phrases otherwise. - -You can also check "project into" tab to be sure, that "Language" is set correctly (this will allow you to spell check your translation). - -### 5. Update opened .po file from sources -Once you have set your path correctly, you are able to update phrases from sources. Press "Update catalog - synchronize it with sources" button or go to "Catalog"->"Update from sources" menu. - -As a result you will see confirmation popup with two tabs: "New strings" and "Obsolete strings". Please review and accept changes (or press "Undo" if you see too many obsolete strings, as Poedit will remove them all - in this case please make sure all previous steps are performed w/o errors). - -### 6. Translate and save your .po file -If you have any difficulties on this step, please consult with Poedit manual. -Every time you save your .po file, Poedit will also compile appropriate .mo file by default (of course, if not disabled in preferences). - -You are now almost done. - -### 7. Clear cache again -This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi). - - -##To create new translation -You just have to copy the folder corresponding to the language you want to translate from, change language in the project settings and for the folder and files names. Then start replacing all existing translations with your own. - diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 221ad6db..00000000 --- a/Vagrantfile +++ /dev/null @@ -1,71 +0,0 @@ - -$script_sqlite = <