Merge pull request #1097 from annando/acvlang

[friendica-addons.git/.git] / tictac / tictac.php

diff --git a/tictac/tictac.php b/tictac/tictac.php
index fe2c5cf..47c9e80 100644 (file)
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -5,20 +5,15 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
+use Friendica\DI;
 
 function tictac_install() {
-       Addon::registerHook('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu');
-}
-
-function tictac_uninstall() {
-       Addon::unregisterHook('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu');
-
+       Hook::register('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu');
 }
 
 function tictac_app_menu($a,&$b) {
-       $b['app_menu'][] = '<div class="app-title"><a href="tictac">' . L10n::t('Three Dimensional Tic-Tac-Toe') . '</a></div>';
+       $b['app_menu'][] = '<div class="app-title"><a href="tictac">' . DI::l10n()->t('Three Dimensional Tic-Tac-Toe') . '</a></div>';
 }
 
 
@@ -51,17 +46,17 @@ function tictac_content(&$a) {
    $dimen = 3;
   }
 
-  $o .=  '<h3>' . L10n::t('3D Tic-Tac-Toe') . '</h3><br />';
+  $o .=  '<h3>' . DI::l10n()->t('3D Tic-Tac-Toe') . '</h3><br />';
 
   $t = new tictac($dimen,$handicap,$mefirst,$yours,$mine);
   $o .= $t->play();
 
-  $o .=  '<a href="tictac">' . L10n::t('New game') . '</a><br />';
-  $o .=  '<a href="tictac/1">' . L10n::t('New game with handicap') . '</a><br />';
-  $o .=  '<p>' . L10n::t('Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. ');
-  $o .= L10n::t('In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.');
+  $o .=  '<a href="tictac">' . DI::l10n()->t('New game') . '</a><br />';
+  $o .=  '<a href="tictac/1">' . DI::l10n()->t('New game with handicap') . '</a><br />';
+  $o .=  '<p>' . DI::l10n()->t('Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. ');
+  $o .= DI::l10n()->t('In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.');
   $o .= '</p><p>';
-  $o .= L10n::t('The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.');
+  $o .= DI::l10n()->t('The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.');
   $o .= '</p>';
 
   return $o;
@@ -180,24 +175,24 @@ class tictac {
 
      if($this->first_move) {
        if(rand(0,1) == 1) {
-         $o .=  '<div class="error-message">' . L10n::t('You go first...') . '</div><br />';
+         $o .=  '<div class="error-message">' . DI::l10n()->t('You go first...') . '</div><br />';
          $this->mefirst = 0;
          $o .= $this->draw_board();
          return $o;
        }
-       $o .=  '<div class="error-message">' . L10n::t('I\'m going first this time...') . ' </div><br />';
+       $o .=  '<div class="error-message">' . DI::l10n()->t('I\'m going first this time...') . ' </div><br />';
        $this->mefirst = 1;
 
      }
 
      if($this->check_youwin()) {
-       $o .=  '<div class="error-message">' . L10n::t('You won!') . '</div><br />';
+       $o .=  '<div class="error-message">' . DI::l10n()->t('You won!') . '</div><br />';
        $o .= $this->draw_board();
        return $o;
      }
 
      if($this->fullboard())
-       $o .=  '<div class="error-message">' . L10n::t('"Cat" game!') . '</div><br />';
+       $o .=  '<div class="error-message">' . DI::l10n()->t('"Cat" game!') . '</div><br />';
 
      $move = $this->winning_move();
      if(strlen($move)) {
@@ -220,9 +215,9 @@ class tictac {
      }
 
      if($this->check_iwon())
-       $o .=  '<div class="error-message">' . L10n::t('I won!') . '</div><br />';
+       $o .=  '<div class="error-message">' . DI::l10n()->t('I won!') . '</div><br />';
      if($this->fullboard())
-       $o .=  '<div class="error-message">' . L10n::t('"Cat" game!') . '</div><br />';
+       $o .=  '<div class="error-message">' . DI::l10n()->t('"Cat" game!') . '</div><br />';
      $o .= $this->draw_board();
        return $o;
   }