[mb-commits] branch, beta, updated. Merge remote-tracking branch 'reosarevok/mbs-5505' into beta Adding j-lyric t...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6f9fc7ef72437b86b5a816f950a2ec642db65316 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6be98ac6fd6f56f4549fd6bfb8862fe67a91db21 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=80d2d0cec477086ee8436933e6196a40d2b89938 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9e74fc25f10657b2c25e44c7be4a4e8230f40020 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5f88531f09071c87dd2a47491023b5f6b124d71b (commit)

Summary of changes:
 root/components/common-macros.tt                  |   12 ++++++------
 root/static/scripts/edit/MB/Control/URLCleanup.js |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f9fc7ef72437b86b5a816f950a2ec642db65316
Merge: 6be98ac 80d2d0c
Author: Oliver Charles <[email protected]>
Date:   Mon Jan 28 12:11:15 2013 +0000

    Merge remote-tracking branch 'reosarevok/mbs-5505' into beta
    
    * reosarevok/mbs-5505:
      Adding j-lyric to the whitelist


commit 6be98ac6fd6f56f4549fd6bfb8862fe67a91db21
Merge: 5f88531 9e74fc2
Author: Oliver Charles <[email protected]>
Date:   Mon Jan 28 12:10:40 2013 +0000

    Merge remote-tracking branch 'reosarevok/mbs-5779' into beta
    
    * reosarevok/mbs-5779:
      Remove useless nbsp


commit 80d2d0cec477086ee8436933e6196a40d2b89938
Author: reosarevok <[email protected]>
Date:   Sun Jan 27 16:23:11 2013 +0000

    Adding j-lyric to the whitelist

diff --git a/root/static/scripts/edit/MB/Control/URLCleanup.js b/root/static/scripts/edit/MB/Control/URLCleanup.js
index 74966f8..da088b4 100644
--- a/root/static/scripts/edit/MB/Control/URLCleanup.js
+++ b/root/static/scripts/edit/MB/Control/URLCleanup.js
@@ -271,7 +271,7 @@ MB.constants.CLEANUPS = {
         }
     },
     lyrics: {
-        match: new RegExp("^(https?://)?([^/]+\\.)?(lyrics\\.wikia\\.com|directlyrics\\.com|lyricstatus\\.com|kasi-time\\.com|wikisource\\.org|recmusic\\.org)", "i"),
+        match: new RegExp("^(https?://)?([^/]+\\.)?(lyrics\\.wikia\\.com|directlyrics\\.com|lyricstatus\\.com|kasi-time\\.com|wikisource\\.org|recmusic\\.org|j-lyric\\.net)", "i"),
         type: MB.constants.LINK_TYPES.lyrics
     },
     bbcmusic: {

commit 9e74fc25f10657b2c25e44c7be4a4e8230f40020
Author: reosarevok <[email protected]>
Date:   Sat Jan 26 21:09:51 2013 +0000

    Remove useless nbsp

diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index ee84d23..be5d2b8 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -55,22 +55,22 @@ END; -%]
         l('aged {num}', { num => age.0 });
       ELSE;
         IF age.0;
-          ln('{num} year', '{num}&#xa0;years', age.0, { num => age.0 });
+          ln('{num} year', '{num} years', age.0, { num => age.0 });
         ELSIF age.1;
-          ln('{num} month', '{num}&#xa0;months', age.1, { num => age.1 });
+          ln('{num} month', '{num} months', age.1, { num => age.1 });
         ELSE;
-          ln('{num} day', '{num}&#xa0;days', age.2, { num => age.2 });
+          ln('{num} day', '{num} days', age.2, { num => age.2 });
         END;
       END;
     END -%]
 
 [%- MACRO display_age_ago(age) BLOCK;
         IF age.0;
-          ln('{num} year ago', '{num}&#xa0;years ago', age.0, { num => age.0 });
+          ln('{num} year ago', '{num} years ago', age.0, { num => age.0 });
         ELSIF age.1;
-          ln('{num} month ago', '{num}&#xa0;months ago', age.1, { num => age.1 });
+          ln('{num} month ago', '{num} months ago', age.1, { num => age.1 });
         ELSE;
-          ln('{num} day ago', '{num}&#xa0;days ago', age.2, { num => age.2 });
+          ln('{num} day ago', '{num} days ago', age.2, { num => age.2 });
         END;
     END -%]
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server