.gitignore GEMS README.rdoc Rakefile app/controllers/application.rb app/controllers/articles.rb app/controllers/exceptions.rb app/helpers/articles_helper.rb app/helpers/global_helpers.rb app/helpers/statistics_helper.rb app/models/article.rb app/models/device.rb app/models/parsers/image.rb app/models/parsers/wml.rb app/models/parsers/xhtml.rb app/models/server.rb app/models/wikipedia_resource.rb app/views/articles/file.html.haml app/views/articles/home.html.haml app/views/articles/home.json.haml app/views/articles/show.html.haml app/views/articles/show.wml.haml app/views/exceptions/not_acceptable.html.erb app/views/exceptions/not_found.html.erb app/views/exceptions/standard_error.html.erb app/views/layout/_javascript.html.haml app/views/layout/_search_default.html.haml app/views/layout/_search_kindle.html.haml app/views/layout/_search_webkit.html.haml app/views/layout/_search_wml.html.haml app/views/layout/application.html.haml app/views/layout/application.wml.haml app/views/layout/exceptions.html.haml autotest/discover.rb autotest/merb.rb autotest/merb_rspec.rb @@ -9,7 +9,7 @@ require 'rubygems' require 'merb-core' -Merb::Config.setup(:merb_root => File.expand_path(File.dirname(__FILE__)), +Merb::Config.setup(:merb_root => ::File.expand_path(::File.dirname(__FILE__)), :environment => ENV['RACK_ENV']) Merb.environment = "production" Merb.root = Merb::Config[:merb_root] config.ru config/environments/development.rb config/environments/production.rb config/environments/rake.rb config/environments/staging.rb config/environments/test.rb config/formats.yaml config/hoptoad.yml config/init.rb config/rackup.ru config/router.rb config/wikipedias.yaml doc/rdoc/generators/merb_generator.rb doc/rdoc/generators/template/merb/api_grease.js doc/rdoc/generators/template/merb/index.html.erb doc/rdoc/generators/template/merb/merb.css doc/rdoc/generators/template/merb/merb.rb doc/rdoc/generators/template/merb/merb_doc_styles.css doc/rdoc/generators/template/merb/prototype.js lib/cache.rb lib/log/merb.main.pid lib/merb_hoptoad_notifier/LICENSE lib/merb_hoptoad_notifier/README lib/merb_hoptoad_notifier/TODO lib/merb_hoptoad_notifier/lib/merb_hoptoad_notifier.rb lib/merb_hoptoad_notifier/lib/merb_hoptoad_notifier/hoptoad_notifier.rb lib/merb_hoptoad_notifier/lib/merb_hoptoad_notifier/merbtasks.rb lib/merb_hoptoad_notifier/merb_hoptoad_notifier.gemspec lib/merb_hoptoad_notifier/merbtasks.rb lib/merb_hoptoad_notifier/spec/fixtures/hoptoad.yml lib/merb_hoptoad_notifier/spec/merb_hoptoad_notifier_spec.rb lib/merb_hoptoad_notifier/spec/spec.opts lib/merb_hoptoad_notifier/spec/spec_helper.rb lib/moneta/LICENSE lib/moneta/README lib/moneta/Rakefile lib/moneta/TODO lib/moneta/lib/moneta.rb lib/moneta/lib/moneta/basic_file.rb lib/moneta/lib/moneta/berkeley.rb lib/moneta/lib/moneta/couch.rb lib/moneta/lib/moneta/datamapper.rb lib/moneta/lib/moneta/file.rb lib/moneta/lib/moneta/lmc.rb lib/moneta/lib/moneta/memcache.rb lib/moneta/lib/moneta/memory.rb lib/moneta/lib/moneta/mongodb.rb lib/moneta/lib/moneta/redis.rb lib/moneta/lib/moneta/rufus.rb lib/moneta/lib/moneta/s3.rb lib/moneta/lib/moneta/sdbm.rb lib/moneta/lib/moneta/tyrant.rb lib/moneta/lib/moneta/xattr.rb lib/moneta/moneta.gemspec lib/moneta/spec/moneta_basic_file_spec.rb lib/moneta/spec/moneta_berkeley_spec.rb lib/moneta/spec/moneta_couch_spec.rb lib/moneta/spec/moneta_datamapper_spec.rb lib/moneta/spec/moneta_file_spec.rb lib/moneta/spec/moneta_lmc_spec.rb lib/moneta/spec/moneta_memcache_spec.rb lib/moneta/spec/moneta_memory_spec.rb lib/moneta/spec/moneta_mongodb_spec.rb lib/moneta/spec/moneta_redis_spec.rb lib/moneta/spec/moneta_rufus_spec.rb lib/moneta/spec/moneta_s3_spec.rb lib/moneta/spec/moneta_sdbm_spec.rb lib/moneta/spec/moneta_tyrant_spec.rb lib/moneta/spec/moneta_xattr_spec.rb lib/moneta/spec/shared.rb lib/moneta/spec/spec_helper.rb lib/object.rb lib/tasks/todo.rake lib/wikipedia/wikipedia.rb merb.thor @@ -15,11 +15,11 @@ class Merb::Request def language_code return params[:lang].downcase if params[:lang] language_code = host.split(".").first.downcase - if Merb.env?(:test) || language_code.include?("localhost") || language_code == "eiximenis" || language_code == "iwik" + if Merb.env?(:test) || language_code.include?("localhost") || language_code == "mobile1" || language_code == "iwik" language_code = "en" end params[:lang] ||= language_code language_code end -end \ No newline at end of file +end merb/extensions/request_extensions.rb public/apple-touch-icon.png public/favicon.ico public/images/arrow.gif public/images/logo-en.png public/images/merb.jpg public/images/w.gif public/robots.txt public/stylesheets/android.css public/stylesheets/blackberry.css public/stylesheets/default.css public/stylesheets/firefox.css public/stylesheets/kindle.css public/stylesheets/sass/_tables.sass public/stylesheets/sass/android.sass public/stylesheets/sass/blackberry.sass public/stylesheets/sass/default.sass public/stylesheets/sass/firefox.sass public/stylesheets/sass/kindle.sass public/stylesheets/sass/webkit.sass public/stylesheets/webkit.css public/webkit.js spec/fixtures/controllers/foo.rb spec/fixtures/controllers/test_base.rb spec/fixtures/controllers/views/layout/application.html.erb spec/fixtures/controllers/views/layout/application.webkit.erb spec/fixtures/controllers/views/layout/application.webkit_native.erb spec/fixtures/file.gzip spec/lib/cache_spec.rb spec/merb/extensions/request_spec.rb spec/models/article_spec.rb spec/models/daily_usage_spec.rb spec/models/device_spec.rb spec/models/parsers/xhtml_spec.rb spec/models/parsers/xhtml_spec_documents.rb spec/requests/articles_spec.rb spec/requests/statistics_spec.rb spec/spec.opts spec/spec_helper.rb spec/spec_helpers/article_gzipped.rb spec/spec_helpers/article_html.rb spec/spec_helpers/request.rb spec/spec_helpers/ua_strings.rb stats/config.ru stats/init.rb stats/models/stat_segment.rb stats/parse.rb stats/public/.keep stats/run.rb stats/server.rb stats/views/hourly.haml stats/views/index.haml stats/views/layout.haml wikifake/server.rb c4c425b8f991a59f6c40040a7631a3e2cb9233d5 root root@mobile1.wikimedia.org http://github.com/hcatlin/wikimedia-mobile/commit/34904c5f2b749e2eaf6189548fc5c516f22776f8 34904c5f2b749e2eaf6189548fc5c516f22776f8 2009-06-29T15:35:54-07:00 2009-06-29T15:35:54-07:00 file modes 4ef68c824a1f14614e2d585f7bd087a397e38822 root root@mobile1.wikimedia.org