The overloaded DB_DataObject function staticGet is now called getKV

[quix0rs-gnu-social.git] / lib / applicationlist.php

diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index 6801fb6cf1e428eaf90b72ed17e16392b650ec02..ee968590e80cd0967d8953da02d15448dff842cd 100644 (file)
--- a/lib/applicationlist.php
+++ b/lib/applicationlist.php
@@ -142,10 +142,8 @@ class ApplicationList extends Widget
     {
         return;
     }
-
 }
 
-
 /**
  * Widget to show a list of connected OAuth clients
  *
@@ -204,7 +202,7 @@ class ConnectedAppsList extends Widget
 
     function showConnection()
     {
-        $app = Oauth_application::staticGet('id', $this->connection->application_id);
+        $app = Oauth_application::getKV('id', $this->connection->application_id);
 
         $this->out->elementStart(
             'li',
@@ -239,13 +237,16 @@ class ConnectedAppsList extends Widget
         $this->out->elementEnd('a');
 
         if ($app->name == 'anonymous') {
-            $this->out->element('span', 'fn', "Unknown application");
+            // TRANS: Name for an anonymous application in application list.
+            $this->out->element('span', 'fn', _('Unknown application'));
         }
 
         $this->out->elementEnd('span');
 
         if ($app->name != 'anonymous') {
-
+            // @todo FIXME: i18n trouble.
+            // TRANS: Message has a leading space and a trailing space. Used in application list.
+            // TRANS: Before this message the application name is put, behind it the organisation that manages it.
             $this->out->raw(_(' by '));
 
             $this->out->element(
@@ -269,6 +270,7 @@ class ConnectedAppsList extends Widget
         // TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
         $txt = sprintf(_('Approved %1$s - "%2$s" access.'), $modifiedDate, $access);
 
+        // @todo FIXME: i18n trouble.
         $this->out->raw(" - $txt");
         if (!empty($app->description)) {
             $this->out->element(
@@ -279,7 +281,9 @@ class ConnectedAppsList extends Widget
         $this->out->element(
             'p', array(
             'class' => 'access_token'),
-            _('Access token starting with: ') . substr($this->connection->token, 0, 7)
+            // TRANS: Access token in the application list.
+            // TRANS: %s are the first 7 characters of the access token.
+            sprintf(_('Access token starting with: %s'), substr($this->connection->token, 0, 7))
         );
 
         $this->out->elementStart(
@@ -294,12 +298,11 @@ class ConnectedAppsList extends Widget
         $this->out->elementStart('fieldset');
         $this->out->hidden('oauth_token', $this->connection->token);
         $this->out->hidden('token', common_session_token());
-        // TRANS: Button label
-        $this->out->submit('revoke', _('Revoke'));
+        // TRANS: Button label in application list to revoke access to user data.
+        $this->out->submit('revoke', _m('BUTTON','Revoke'));
         $this->out->elementEnd('fieldset');
         $this->out->elementEnd('form');
 
         $this->out->elementEnd('li');
-
     }
 }