Fix issue with API: the client requested 'list' instead of 'update' for updating gist and the update controller found bad gist

README.md

@@ -40,41 +40,41 @@ Requirements
 
 Git can maybe be downloaded from your system's repositories.
 
-	$ git config --global user.email "you@example.com"
-	$ git config --global user.name "Your Name"
+    $ git config --global user.email "you@example.com"
+    $ git config --global user.name "Your Name"
 
 ### Composer
 
 Composer can maybe be downloaded from your system's repositories.
 Else, follow the next instructions:
 
-	# With cURL
-	$ curl -sS https://getcomposer.org/installer | php
+    # With cURL
+    $ curl -sS https://getcomposer.org/installer | php
 
-	# With Wget
-	$ wget -O - -q https://getcomposer.org/installer | php
+    # With Wget
+    $ wget -O - -q https://getcomposer.org/installer | php
 
-	$ chmod +x composer.phar
+    $ chmod +x composer.phar
 
-	# For a local installation and if the envvar PATH contains "$HOME/bin/"
-	$ mv composer.phar ~/bin/composer
+    # For a local installation and if the envvar PATH contains "$HOME/bin/"
+    $ mv composer.phar ~/bin/composer
 
-	# For a global installation
-	$ sudo mv composer.phar /usr/local/bin/composer
+    # For a global installation
+    $ sudo mv composer.phar /usr/local/bin/composer
 
 ### Bower
 
-	$ sudo apt-get install npm
-	$ sudo npm install -g bower
+    $ sudo apt-get install npm
+    $ sudo npm install -g bower
 
 Installation
 ------------
 
-	$ cd /path/to/www/
-	$ git clone https://gitnet.fr/deblan/gist
-	$ cd gist
-	$ make
-	$ cp propel-dist.yaml propel.yaml
+    $ cd /path/to/www/
+    $ git clone https://gitnet.fr/deblan/gist
+    $ cd gist
+    $ make
+    $ cp propel-dist.yaml propel.yaml
 
 Edit `propel.yaml`. **Use spaces instead of tabulations**.
 
@@ -120,12 +120,12 @@ See the [configuration section](#configuration) for more information about confi
 
 The web server must have permission to write into `data`.
 
-	$ sudo chown -R www-data:www-data data
+    $ sudo chown -R www-data:www-data data
 
 Your webserver must be configured to serve `web/` as document root. If you use nginx, all virtual paths must be rooted with `web/index.php` or `web/app_dev.php` ([documentation](https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/)). If you use apache, you must enable the `rewrite` module and restart:
 
-	$ sudo a2enmod rewrite
-	$ sudo service apache2 restart
+    $ sudo a2enmod rewrite
+    $ sudo service apache2 restart
 
 `app_dev.php` is the development router. Access is granted for an IP range defined in the same file.
 
@@ -134,8 +134,8 @@ Upgrade
 
 If your version is less than v1.4.2, run: `test -d app && git add app && git commit -m "Configuration"`.
 
-	$ make update
-	$ make propel
+    $ make update
+    $ make propel
 
 If you upgrade to v1.4.1 or more: `app/console migrate:to:v1.4.1`.
 
@@ -282,7 +282,7 @@ Response example:
         "file": "55abcfa7771e0",
         "createdAt": "2015-07-19T16:26:15Z",
         "updatedAt": "2015-07-19T16:30:15Z"
-		"url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/abcgi72967dd95e3461490dcaa310d728d6adef",
+        "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/abcgi72967dd95e3461490dcaa310d728d6adef",
     },
     {
         "id": 67,
@@ -292,9 +292,9 @@ Response example:
         "file": "xyzbcfa7771e0",
         "createdAt": "2015-08-19T16:26:15Z",
         "updatedAt": "2015-08-19T16:30:15Z"
-		"url": "https:\/\/gist.deblan.org\/en\/view\/5byzbcfa7771e0\/def72967dd95e346koq0dcaa310d728d6artu",
+        "url": "https:\/\/gist.deblan.org\/en\/view\/5byzbcfa7771e0\/def72967dd95e346koq0dcaa310d728d6artu",
     },
-	...
+    ...
 ]
 ```
 
@@ -386,21 +386,21 @@ Gist uses [Magallanes](http://magephp.com/) to manage deployment.
 
 **Global installation**
 
-	$ composer global require andres-montanez/magallanes
-	# if the envvar PATH contains "$HOME/bin/"
-	$ ln -s ~/.composer/vendor/bin/mage ~/bin/mage
+    $ composer global require andres-montanez/magallanes
+    # if the envvar PATH contains "$HOME/bin/"
+    $ ln -s ~/.composer/vendor/bin/mage ~/bin/mage
 
 **Local installation**
 
-	$ composer require andres-montanez/magallanes
+    $ composer require andres-montanez/magallanes
 
 There is an example of the configuration of an environment in `.mage/config/environment/prod.yml.dist`.
 
-	# global installation
-	$ mage deploy to:prod
+    # global installation
+    $ mage deploy to:prod
 
-	# local installation
-	$ ./vendor/andres-montanez/magallanes/bin/mage deploy to:prod
+    # local installation
+    $ ./vendor/andres-montanez/magallanes/bin/mage deploy to:prod
 
 Contributors
 ------------
@@ -416,3 +416,4 @@ Contributors
 * Marjorie Da Silva
 * Mélanie Chanat
 * Showfom
+* Tavin

app/bootstrap.php.d/30-trans.php

@@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie;
 $app->register(new TranslationServiceProvider(), array(
     'locale' => 'en',
     'locale_fallback' => 'en',
-    'locales' => array('en', 'fr', 'es', 'de', 'cn'),
+    'locales' => array('en', 'fr', 'es', 'de', 'cn', 'pl'),
 ));
 
 $app['translator'] = $app->extend('translator', function ($translator, $app) {

app/locales/pl.yml

@@ -0,0 +1,108 @@
+app:
+    title: '#!GIST'
+    title_prefix: '#!GIST - '
+
+    menu:
+        home:
+            title: 'Home'
+        about:
+            title: 'O projekcie'
+        my:
+            login:
+                title: 'Logowanie'
+            logout:
+                title: 'Wylogowanie'
+            register:
+                title: 'Rejestracja'
+            my:
+                title: 'Konta'
+
+my:
+    title: 'Moje wklejki'
+    nothing: 'Nie ma jeszcze nic!'
+    api:
+        title: 'API'
+        warning: 'Trzymaj to w <strong>sekrecie!</strong>'
+        form:
+            generate: 'Wygeneruj nowy'
+
+
+gist:
+    untitled: 'Bez tytułu'
+    404:
+        title: 'Oops!'
+        message: 'Wklejka nie została znaleziona...'
+    action:
+        view: 'Podgląd'
+        history: 'Commit(s)'
+        raw: 'RAW'
+        download: 'Pobierz'
+        clone: 'Sklonuj'
+        embed: 'Embed'
+        add: 'Nowa'
+
+date:
+    format: 'Y-m-d h:i:s'
+
+footer:
+    text: '<p>Napędzane przez <a href="https://gitnet.fr/deblan/gist">GIST</a>, to jest open source :) - <a href="https://gitnet.fr/deblan/gist#api">API</a></p>'
+
+login:
+    login:
+        title: 'Logowanie'
+        invalid: 'Nie prawidłowy login lub hasło.'
+        form:
+            username:
+                placeholder: 'Login'
+            password:
+                placeholder: 'Hasło'
+            remember_me:
+                label: 'Pamiętaj'
+    register:
+        title: 'Nowe konto'
+        already_exists: 'Ta nazwa użytkownika jest już zarejestrowana!'
+        registred: 'Gratulacje, twoje konto zostało utworzone!'
+        form:
+            username:
+                placeholder: 'Login'
+            current_password:
+                placeholder: 'Obecne hasło'
+            password:
+                placeholder: 'Hasło'
+
+form:
+    error:
+        password: 'Nie prawidłowe hasło.'
+        not_blank: 'To pole nie powinno być puste!'
+    title:
+        placeholder: 'Tytuł'
+    cipher:
+        label: 'Szyfrowanie: %value%'
+        choice:
+            anyway: 'Tak czy inaczej'
+            yes: 'Tak'
+            no: 'Nie'
+    submit: 'Wyślij'
+    filter: 'Filtr'
+    confirm: 'Potwierdzasz?'
+    success:
+        password: 'Hasło zostało zaktualizowane.'
+        gist: 'Wklejka została usunięta.'
+    type:
+        label: 'Język: %value%'
+        choice:
+            all: 'All'
+            html: 'HTML'
+            xml: 'XML'
+            css: 'CSS'
+            javascript: 'JAVASCRIPT'
+            php: 'PHP'
+            sql: 'SQL'
+            yaml: 'YAML'
+            perl: 'PERL'
+            c: 'C/C++'
+            asp: 'ASP'
+            python: 'PYTHON'
+            bash: 'BASH'
+            actionscript3: 'ACTION SCRIPT'
+            text: 'TEXT'

composer.json

@@ -1,4 +1,7 @@
 {
+    "name": "deblan/gist",
+    "license": "GPL-3.0-only",
+    "type": "project",
     "require": {
         "silex/silex": "1.3.x-dev",
         "symfony/yaml": "~2.6",

src/Gist/Api/Client.php

@@ -88,7 +88,7 @@ class Client extends BaseClient
     public function update($gist, $content)
     {
         $response = $this->post(
-            str_replace('{gist}', $gist, $this->mergeApiKey(self::LIST)),
+            str_replace('{gist}', $gist, $this->mergeApiKey(self::UPDATE)),
             array(
                 'form_params' => array(
                     'form' => array(

src/Gist/Controller/ApiController.php

@@ -158,12 +158,16 @@ class ApiController extends Controller
             return $this->invalidMethodResponse('POST method is required.');
         }
 
-        $gist = GistQuery::create()
-            ->filterByCipher(false)
-            ->filterById((int) $gist)
-            ->_or()
-            ->filterByFile($gist)
-            ->findOne();
+        $query = GistQuery::create()
+            ->filterByCipher(false);
+
+        if (ctype_digit($gist)) {
+            $query->filterById((int) $gist);
+        } else {
+            $query->filterByFile($gist);
+        }
+
+        $gist = $query->findOne();
 
         if (!$gist) {
             return $this->invalidRequestResponse('Invalid Gist');

src/Gist/Resources/views/base.html.twig

@@ -81,7 +81,7 @@
                         </ul>
                         {% block langs %}
                             <p class="navbar-text navbar-right">
-                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de', 'cn': 'cn'} %}
+                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de', 'cn': 'cn', 'pl': 'pl'} %}
                                     <a class="lang btn btn-xs cipher-link" href="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({_locale: locale})) }}">
                                         <span class="flag-icon flag-icon-{{ flag }}"></span>
                                     </a>