ref: refs/heads/use-activeresource
commit 466a0edd2b35190fdf5d8e1080d5fcd107207f54
Author: Stefan Schubert
Date: Mon Sep 21 16:25:26 2009 +0200
cleanup for gettext stuff
---
Rakefile | 2 +-
plugins/administrator/po/de/yast_webclient.po | 49 --------------------
plugins/administrator/po/en/yast_webclient.po | 49 --------------------
.../app/controllers/custom_services_controller.rb | 18 +++++++
.../po/de/yast_webclient_custom_services.po | 21 ++++++++
.../po/en/yast_webclient_custom_services.po | 21 ++++++++
plugins/language/tasks/language_tasks.rake | 13 -----
webclient/po/de/yast_webclient.po | 2 +-
webclient/po/en/yast_webclient.po | 2 +-
webclient/po/yast_webclient.pot | 2 +-
10 files changed, 64 insertions(+), 115 deletions(-)
diff --git a/Rakefile b/Rakefile
index f549b0e..57a0cce 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,7 @@ desc 'Run all tests by default'
task :default => :test
-%w(makemo test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name|
+%w(makemo updatepo test test:ui rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local test:test:rcov).each do |task_name|
desc "Run #{task_name} task for all projects"
task task_name do
PROJECTS.each do |project|
diff --git a/plugins/administrator/po/de/yast_webclient.po b/plugins/administrator/po/de/yast_webclient.po
deleted file mode 100644
index bc743b8..0000000
--- a/plugins/administrator/po/de/yast_webclient.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: yast_webclient 1.0.0\n"
-"POT-Creation-Date: 2009-09-17 11:47+0200\n"
-"PO-Revision-Date: 2009-09-17 11:47+0200\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: app/controllers/administrator_controller.rb:11
-msgid "Invalid session, please login again."
-msgstr ""
-
-#: app/controllers/administrator_controller.rb:39
-msgid "Enter a valid e-mail address."
-msgstr ""
-
-#: app/controllers/administrator_controller.rb:45
-msgid "Passwords do not match."
-msgstr ""
-
-#: app/views/administrator/index.html.erb:20
-msgid "Administrator Settings"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:29
-msgid "Password"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:33
-msgid "Confirm Password"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:35 app/views/administrator/index.html.erb:40
-msgid "Save"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:38
-msgid "Forward mail to"
-msgstr ""
diff --git a/plugins/administrator/po/en/yast_webclient.po b/plugins/administrator/po/en/yast_webclient.po
deleted file mode 100644
index bc743b8..0000000
--- a/plugins/administrator/po/en/yast_webclient.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: yast_webclient 1.0.0\n"
-"POT-Creation-Date: 2009-09-17 11:47+0200\n"
-"PO-Revision-Date: 2009-09-17 11:47+0200\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: app/controllers/administrator_controller.rb:11
-msgid "Invalid session, please login again."
-msgstr ""
-
-#: app/controllers/administrator_controller.rb:39
-msgid "Enter a valid e-mail address."
-msgstr ""
-
-#: app/controllers/administrator_controller.rb:45
-msgid "Passwords do not match."
-msgstr ""
-
-#: app/views/administrator/index.html.erb:20
-msgid "Administrator Settings"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:29
-msgid "Password"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:33
-msgid "Confirm Password"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:35 app/views/administrator/index.html.erb:40
-msgid "Save"
-msgstr ""
-
-#: app/views/administrator/index.html.erb:38
-msgid "Forward mail to"
-msgstr ""
diff --git a/plugins/custom_services/app/controllers/custom_services_controller.rb b/plugins/custom_services/app/controllers/custom_services_controller.rb
new file mode 100644
index 0000000..1bab9cd
--- /dev/null
+++ b/plugins/custom_services/app/controllers/custom_services_controller.rb
@@ -0,0 +1,18 @@
+require 'yast/service_resource'
+
+
+class CustomServiceController < ApplicationController
+ before_filter :login_required
+ layout 'main'
+ include ProxyLoader
+
+ # Initialize GetText and Content-Type.
+ init_gettext "yast_webclient_custom_services" # textdomain, options(:charset, :content_type)
+
+
+ def index
+ _("test")
+ end
+
+
+end
diff --git a/plugins/custom_services/po/de/yast_webclient_custom_services.po b/plugins/custom_services/po/de/yast_webclient_custom_services.po
new file mode 100644
index 0000000..ff9b038
--- /dev/null
+++ b/plugins/custom_services/po/de/yast_webclient_custom_services.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: yast_webclient custom_services 1.0.0\n"
+"POT-Creation-Date: 2009-09-21 15:52+0200\n"
+"PO-Revision-Date: 2009-09-21 15:52+0200\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: app/controllers/custom_services_controller.rb:14
+msgid ""
+msgstr ""
diff --git a/plugins/custom_services/po/en/yast_webclient_custom_services.po b/plugins/custom_services/po/en/yast_webclient_custom_services.po
new file mode 100644
index 0000000..ff9b038
--- /dev/null
+++ b/plugins/custom_services/po/en/yast_webclient_custom_services.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: yast_webclient custom_services 1.0.0\n"
+"POT-Creation-Date: 2009-09-21 15:52+0200\n"
+"PO-Revision-Date: 2009-09-21 15:52+0200\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: app/controllers/custom_services_controller.rb:14
+msgid ""
+msgstr ""
diff --git a/plugins/language/tasks/language_tasks.rake b/plugins/language/tasks/language_tasks.rake
index 3f425a8..7063795 100644
--- a/plugins/language/tasks/language_tasks.rake
+++ b/plugins/language/tasks/language_tasks.rake
@@ -3,16 +3,3 @@ begin
rescue LoadError => e
$stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
end
-
-desc "Create mo-files for L10n"
-task :makemo do
- require 'gettext_rails/tools'
- GetText.create_mofiles
-end
-
-desc "Update pot/po files to match new version."
-task :updatepo do
- require 'gettext_rails/tools'
- GetText.update_pofiles("yast_webclient_language", Dir.glob("{app,lib}/**/*.{rb,erb,rhtml}"),
- "yast_webclient language 1.0.0")
-end
diff --git a/webclient/po/de/yast_webclient.po b/webclient/po/de/yast_webclient.po
index dfcb50f..4b04590 100644
--- a/webclient/po/de/yast_webclient.po
+++ b/webclient/po/de/yast_webclient.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: yast_webclient 1.0.0\n"
-"POT-Creation-Date: 2009-09-17 11:44+0200\n"
+"POT-Creation-Date: 2009-09-21 16:05+0200\n"
"PO-Revision-Date: 2009-02-27 09:24+0100\n"
"Last-Translator: Schubert Stefan \n"
"Language-Team: \n"
diff --git a/webclient/po/en/yast_webclient.po b/webclient/po/en/yast_webclient.po
index 8c3625e..08aa848 100644
--- a/webclient/po/en/yast_webclient.po
+++ b/webclient/po/en/yast_webclient.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: yast_webclient 1.0.0\n"
-"POT-Creation-Date: 2009-09-17 11:44+0200\n"
+"POT-Creation-Date: 2009-09-21 16:05+0200\n"
"PO-Revision-Date: 2009-02-26 13:48+0100\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/webclient/po/yast_webclient.pot b/webclient/po/yast_webclient.pot
index 8c3625e..08aa848 100644
--- a/webclient/po/yast_webclient.pot
+++ b/webclient/po/yast_webclient.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: yast_webclient 1.0.0\n"
-"POT-Creation-Date: 2009-09-17 11:44+0200\n"
+"POT-Creation-Date: 2009-09-21 16:05+0200\n"
"PO-Revision-Date: 2009-02-26 13:48+0100\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
