zendesk_apps_support 1.5.0 → 1.6.0

data/config/locales/en.yml

@@ -21,12 +21,11 @@ en:
                 other: ! 'Missing required oauth fields in manifest: %{missing_keys}'
             missing_source: Could not find app.js
             style_in_template: <style> tag in %{template}. Use an app.css file instead.
-            invalid_default_locale: ! '%{defaultLocale} is not a valid default locale.
-              Only two- and three-letter ISO 639 language codes are allowed.'
+            invalid_default_locale: ! '%{defaultLocale} is not a valid default locale.'
             missing_translation_file: ! 'Missing translation file for locale ''%{defaultLocale}''.
               Please read: http://developer.zendesk.com/documentation/apps/i18n.html'
             invalid_location:
-              one: ! '%{invalid_locations} in an invalid location.'
+              one: ! '%{invalid_locations} is an invalid location.'
               other: ! '%{invalid_locations} are invalid locations.'
             invalid_hidden_parameter:
               one: ! '%{invalid_params} is set to hidden and cannot be required.'
@@ -36,8 +35,7 @@ en:
             parameters_not_an_array: App parameters must be an array.
             duplicate_parameters: ! 'Duplicate app parameters defined: %{duplicate_parameters}'
             translation:
-              invalid_locale: ! '%{file} is not a valid locale. Only two- and three-letter
-                ISO 639 language codes are allowed.'
+              invalid_locale: ! '%{file} is not a valid locale.'
               not_json: ! '%{file} is not valid JSON. %{errors}'
               not_json_object: ! '%{file} is not a JSON object.'
             stylesheet_error: ! 'Sass error: %{sass_error}'

data/config/locales/translations/zendesk_apps_support.yml

@@ -50,7 +50,7 @@ parts:
   - translation:
       key: "txt.apps.admin.error.app_build.invalid_default_locale"
       title: "App builder job: invalid default locale"
-      value: "%{defaultLocale} is not a valid default locale. Only two- and three-letter ISO 639 language codes are allowed."
+      value: "%{defaultLocale} is not a valid default locale."
   - translation:
       key: "txt.apps.admin.error.app_build.missing_translation_file"
       title: "App builder job: missing translation file"
@@ -58,7 +58,7 @@ parts:
   - translation:
       key: "txt.apps.admin.error.app_build.invalid_location.one"
       title: "App builder job: invalid locations"
-      value: "%{invalid_locations} in an invalid location."
+      value: "%{invalid_locations} is an invalid location."
   - translation:
       key: "txt.apps.admin.error.app_build.invalid_location.other"
       title: "App builder job: invalid locations"
@@ -90,7 +90,7 @@ parts:
   - translation:
       key: "txt.apps.admin.error.app_build.translation.invalid_locale"
       title: "App builder job: invalid locale file name"
-      value: "%{file} is not a valid locale. Only two- and three-letter ISO 639 language codes are allowed."
+      value: "%{file} is not a valid locale."
   - translation:
       key: "txt.apps.admin.error.app_build.translation.not_json"
       title: "App builder job: translation file is invalid json"

data/lib/zendesk_apps_support/assets/default_styles.scss

@@ -1,21 +1,3 @@
-header {
-  border-bottom: 1px dotted #CCC; margin-bottom: 12px;
-
-  h3 { line-height: 30px; }
-  hr { margin-top: 0; }
-
-  .logo {
-    background: transparent app-asset-url("logo-small.png") no-repeat;
-    background-size: 25px 25px; float: right; height: 25px; width: 25px;
-  }
-
-  .app-warning-icon {
-    cursor: pointer;
-    float: right;
-    margin-left: 2px;
-    padding: 5px;
-  }
+header .logo {
+  background-image: app-asset-url("logo-small.png");
 }
-
-h3 { font-size: 14px; }
-footer { background: none; border: 0 }

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -74,7 +74,7 @@ module ZendeskAppsSupport
         def default_locale_error(manifest, package)
           default_locale = manifest['defaultLocale']
           if !default_locale.nil?
-            if default_locale !~ /^[a-z]{2,3}$/
+            if default_locale !~ Translations::VALID_LOCALE
               ValidationError.new(:invalid_default_locale, :defaultLocale => default_locale)
             elsif package.translation_files.detect { |file| file.relative_path == "translations/#{default_locale}.json" }.nil?
               ValidationError.new(:missing_translation_file, :defaultLocale => default_locale)

data/lib/zendesk_apps_support/validations/translations.rb

@@ -3,11 +3,10 @@ require 'jshintrb'
 module ZendeskAppsSupport
   module Validations
     module Translations
-      class << self
-
-        TRANSLATIONS_PATH = %r{^translations/(.*)\.json$}
-        VALID_LOCALE = /^[a-z]{2,3}$/
+      TRANSLATIONS_PATH = %r{^translations/(.*)\.json$}
+      VALID_LOCALE = /^[a-z]{2}(-\w{2,3})?$/
 
+      class << self
         def call(package)
           package.files.inject([]) do |errors, file|
             if path_match = TRANSLATIONS_PATH.match(file.relative_path)

data/spec/i18n_spec.rb

@@ -16,7 +16,7 @@ describe 'translations' do
     project_root = Pathname.new(File.expand_path('../../', __FILE__))
     zendesk_version  = project_root.join('config/locales/translations/zendesk_apps_support.yml')
     standard_version = project_root.join('config/locales/en.yml')
-    File.mtime(standard_version).should be >= File.mtime(zendesk_version)
+    File.mtime(zendesk_version).should be <= File.mtime(standard_version)
   end
 
 end

data/spec/package_spec.rb

@@ -68,7 +68,7 @@ describe ZendeskAppsSupport::Package do
                         email: "john@example.com"
                     },
                     translations: {"app":{\"name\":\"Buddha Machine\"}},
-                    templates: {"layout":"<style>\\n.app-0 header {\\n  border-bottom: 1px dotted #CCC;\\n  margin-bottom: 12px; }\\n  .app-0 header h3 {\\n    line-height: 30px; }\\n  .app-0 header hr {\\n    margin-top: 0; }\\n  .app-0 header .logo {\\n    background: transparent url(\\"http://localhost:4567/logo-small.png\\") no-repeat;\\n    background-size: 25px 25px;\\n    float: right;\\n    height: 25px;\\n    width: 25px; }\\n  .app-0 header .app-warning-icon {\\n    cursor: pointer;\\n    float: right;\\n    margin-left: 2px;\\n    padding: 5px; }\\n.app-0 h3 {\\n  font-size: 14px; }\\n.app-0 footer {\\n  background: none;\\n  border: 0; }\\n.app-0 h1 {\\n  color: red; }\\n  .app-0 h1 span {\\n    color: green; }\\n</style>\\n<header>\\n  <span class=\\"logo\\"/>\\n  <h3>{{setting \\"name\\"}}</h3>\\n</header>\\n<section data-main/>\\n<footer>\\n  <a href=\\"mailto:{{author.email}}\\">\\n    {{author.name}}\\n  </a>\\n</footer>\\n</div>"},
+                    templates: {"layout":"<style>\\n.app-0 header .logo {\\n  background-image: url(\\"http://localhost:4567/logo-small.png\\"); }\\n.app-0 h1 {\\n  color: red; }\\n  .app-0 h1 span {\\n    color: green; }\\n</style>\\n<header>\\n  <span class=\\"logo\\"/>\\n  <h3>{{setting \\"name\\"}}</h3>\\n</header>\\n<section data-main/>\\n<footer>\\n  <a href=\\"mailto:{{author.email}}\\">\\n    {{author.name}}\\n  </a>\\n</footer>\\n</div>"},
                     frameworkVersion: "0.5"
                 });
 

data/spec/validations/manifest_spec.rb

@@ -35,7 +35,7 @@ describe ZendeskAppsSupport::Validations::Manifest do
   end
 
   it 'should have an error when the defaultLocale is invalid' do
-    manifest = { 'defaultLocale' => 'pt-BR' }
+    manifest = { 'defaultLocale' => 'pt-BR-1' }
     manifest_file = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(manifest))
     package = mock('Package', :files => [manifest_file])
     errors = ZendeskAppsSupport::Validations::Manifest.call(package)

data/spec/validations/translations_spec.rb

@@ -37,7 +37,7 @@ describe ZendeskAppsSupport::Validations::Translations do
 
   context 'when there is a file with an invalid locale for a name' do
     let(:translation_files) do
-      [ mock('AppFile', :relative_path => 'translations/en-US.json', :read => '{}') ]
+      [ mock('AppFile', :relative_path => 'translations/en-US-1.json', :read => '{}') ]
     end
 
     it 'should report the error' do
@@ -48,7 +48,7 @@ describe ZendeskAppsSupport::Validations::Translations do
 
   context 'when there is a file with a valid locale containing valid JSON' do
     let(:translation_files) do
-      [ mock('AppFile', :relative_path => 'translations/en.json', :read => '{}') ]
+      [ mock('AppFile', :relative_path => 'translations/en-US.json', :read => '{}') ]
     end
 
     it 'should be valid' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n